diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.cpp b/engine/server/application/LoginServer/src/shared/LoginServer.cpp index eacfee13..17e7e760 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.cpp +++ b/engine/server/application/LoginServer/src/shared/LoginServer.cpp @@ -1076,25 +1076,7 @@ void LoginServer::validateAccount(const StationId& stationId, uint32 clusterId, // Check cluster npe user limit if (cle->m_numTutorialPlayers > cle->m_onlineTutorialLimit) { - canCreateRegular = false; - canCreateJedi = false; - } - - // limit login/character creation based on subscription feature bits - if (((subscriptionBits & ClientSubscriptionFeature::FreeTrial) != 0) - && ((subscriptionBits & ClientSubscriptionFeature::Base) == 0)) - { - // Check cluster free trial user limit - if (cle->m_numFreeTrialPlayers > cle->m_onlineFreeTrialLimit) - { - canLogin = false; - } - // Check cluster free trial character creation - if (!cle->m_freeTrialCanCreateChar) - { - canCreateRegular = false; - canCreateJedi = false; - } + canLogin = false; } } diff --git a/external/3rd/library/udplibrary/UdpLibrary.cpp b/external/3rd/library/udplibrary/UdpLibrary.cpp index 945b3bf4..2971bb9c 100755 --- a/external/3rd/library/udplibrary/UdpLibrary.cpp +++ b/external/3rd/library/udplibrary/UdpLibrary.cpp @@ -1022,7 +1022,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) { if (e->mBuffer[0] == 0 && e->mBuffer[1] == UdpConnection::cUdpPacketPortAlive) return; // port-alive packets are not supposed to reach the destination machine, but on the odd chance they do, pretend like they never existed - + UdpConnection *con = AddressGetConnection(e->mIp, e->mPort); if (con == nullptr) diff --git a/external/3rd/library/udplibrary/UdpLibrary.hpp b/external/3rd/library/udplibrary/UdpLibrary.hpp index 86534a73..52922dab 100644 --- a/external/3rd/library/udplibrary/UdpLibrary.hpp +++ b/external/3rd/library/udplibrary/UdpLibrary.hpp @@ -1078,7 +1078,7 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, , cDisconnectReasonNewConnectionAttempt, cDisconnectReasonConnectionRefused , cDisconnectReasonMutualConnectError, cDisconnectReasonConnectingToSelf , cDisconnectReasonReliableOverflow - , cDisconnectReasonCount, cDisconnectReasonDosAttack }; + , cDisconnectReasonDosAttack, cDisconnectReasonCount }; // standard AddRef/Release scheme void AddRef();