mirror of
https://github.com/LCEMP/LCEMP.git
synced 2026-07-23 14:47:05 +00:00
fix max players on ded
This commit is contained in:
parent
1e53d9c7e3
commit
7df47ba4cf
|
|
@ -56,7 +56,9 @@ PlayerList::PlayerList(MinecraftServer *server)
|
||||||
|
|
||||||
//int viewDistance = server->settings->getInt(L"view-distance", 10);
|
//int viewDistance = server->settings->getInt(L"view-distance", 10);
|
||||||
|
|
||||||
#ifdef _WINDOWS64
|
#ifdef _DEDICATED_SERVER
|
||||||
|
maxPlayers = server->settings->getInt(L"max-players", 8);
|
||||||
|
#elif defined(_WINDOWS64)
|
||||||
maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
|
maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
|
||||||
#else
|
#else
|
||||||
maxPlayers = server->settings->getInt(L"max-players", 20);
|
maxPlayers = server->settings->getInt(L"max-players", 20);
|
||||||
|
|
@ -481,19 +483,11 @@ void PlayerList::remove(shared_ptr<ServerPlayer> player)
|
||||||
|
|
||||||
shared_ptr<ServerPlayer> PlayerList::getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID onlineXuid)
|
shared_ptr<ServerPlayer> PlayerList::getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID onlineXuid)
|
||||||
{
|
{
|
||||||
#ifdef _WINDOWS64
|
if (players.size() >= (unsigned int)maxPlayers)
|
||||||
if (players.size() >= (unsigned int)MINECRAFT_NET_MAX_PLAYERS)
|
|
||||||
{
|
{
|
||||||
pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull);
|
pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull);
|
||||||
return shared_ptr<ServerPlayer>();
|
return shared_ptr<ServerPlayer>();
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if (players.size() >= maxPlayers)
|
|
||||||
{
|
|
||||||
pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull);
|
|
||||||
return shared_ptr<ServerPlayer>();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
shared_ptr<ServerPlayer> player = shared_ptr<ServerPlayer>(new ServerPlayer(server, server->getLevel(0), userName, new ServerPlayerGameMode(server->getLevel(0)) ));
|
shared_ptr<ServerPlayer> player = shared_ptr<ServerPlayer>(new ServerPlayer(server, server->getLevel(0), userName, new ServerPlayerGameMode(server->getLevel(0)) ));
|
||||||
player->gameMode->player = player; // 4J added as had to remove this assignment from ServerPlayer ctor
|
player->gameMode->player = player; // 4J added as had to remove this assignment from ServerPlayer ctor
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue