summaryrefslogtreecommitdiffstats
path: root/nms-patches/PlayerList.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-07-18 12:39:45 +1000
committermd_5 <git@md-5.net>2015-07-18 12:39:45 +1000
commitaf00fd2a20fe709ce5b2c60f6dfc90efdc66e92d (patch)
tree1ce31126716c7202470438f5680d4d877b0187d7 /nms-patches/PlayerList.patch
parent3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5 (diff)
downloadcraftbukkit-af00fd2a20fe709ce5b2c60f6dfc90efdc66e92d.tar
craftbukkit-af00fd2a20fe709ce5b2c60f6dfc90efdc66e92d.tar.gz
craftbukkit-af00fd2a20fe709ce5b2c60f6dfc90efdc66e92d.tar.lz
craftbukkit-af00fd2a20fe709ce5b2c60f6dfc90efdc66e92d.tar.xz
craftbukkit-af00fd2a20fe709ce5b2c60f6dfc90efdc66e92d.zip
SPIGOT-1058: Fix lost player list capping to 60.
Went missing in the 1.8 update.
Diffstat (limited to 'nms-patches/PlayerList.patch')
-rw-r--r--nms-patches/PlayerList.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch
index e12cf832..d0e447db 100644
--- a/nms-patches/PlayerList.patch
+++ b/nms-patches/PlayerList.patch
@@ -75,10 +75,12 @@
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
WorldData worlddata = worldserver.getWorldData();
BlockPosition blockposition = worldserver.getSpawn();
-@@ -80,6 +115,7 @@
+@@ -79,7 +114,8 @@
+ this.a(entityplayer, (EntityPlayer) null, worldserver);
PlayerConnection playerconnection = new PlayerConnection(this.server, networkmanager, entityplayer);
- playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), worlddata.isHardcore(), worldserver.worldProvider.getDimension(), worldserver.getDifficulty(), this.getMaxPlayers(), worlddata.getType(), worldserver.getGameRules().getBoolean("reducedDebugInfo")));
+- playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), worlddata.isHardcore(), worldserver.worldProvider.getDimension(), worldserver.getDifficulty(), this.getMaxPlayers(), worlddata.getType(), worldserver.getGameRules().getBoolean("reducedDebugInfo")));
++ playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), worlddata.isHardcore(), worldserver.worldProvider.getDimension(), worldserver.getDifficulty(), Math.min(this.getMaxPlayers(), 60), worlddata.getType(), worldserver.getGameRules().getBoolean("reducedDebugInfo"))); // CraftBukkit - cap player list to 60
+ entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
playerconnection.sendPacket(new PacketPlayOutCustomPayload("MC|Brand", (new PacketDataSerializer(Unpooled.buffer())).a(this.getServer().getServerModName())));
playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));