From a83828623b260cfe0c0bae904ed32a97062f704a Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 2 Jan 2019 10:57:47 +1100 Subject: [PATCH] SPIGOT-4562: reducedDebugInfo not updated on world change --- nms-patches/PlayerList.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch index cae3119221..2414ac370c 100644 --- a/nms-patches/PlayerList.patch +++ b/nms-patches/PlayerList.patch @@ -857,7 +857,7 @@ entityplayer.playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE)); entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean("doDaylightCycle"))); -@@ -748,16 +1194,21 @@ +@@ -748,17 +1194,26 @@ entityplayer.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition)); if (worldserver.isRaining()) { @@ -881,9 +881,14 @@ + // entityplayer.triggerHealthUpdate(); + entityplayer.getBukkitEntity().updateScaledHealth(); // CraftBukkit - Update scaled health on respawn and worldchange entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex)); ++ // CraftBukkit start - from GameRules ++ int i = entityplayer.world.getGameRules().get("reducedDebugInfo").b() ? 22 : 23; ++ entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) i)); ++ // CraftBukkit end } -@@ -819,26 +1270,39 @@ + public int getPlayerCount() { +@@ -819,26 +1274,39 @@ } public void u() { @@ -928,7 +933,7 @@ if (serverstatisticmanager == null) { File file = new File(this.server.getWorldServer(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats"); -@@ -853,7 +1317,7 @@ +@@ -853,7 +1321,7 @@ } serverstatisticmanager = new ServerStatisticManager(this.server, file1); @@ -937,7 +942,7 @@ } return serverstatisticmanager; -@@ -861,14 +1325,14 @@ +@@ -861,14 +1329,14 @@ public AdvancementDataPlayer h(EntityPlayer entityplayer) { UUID uuid = entityplayer.getUniqueID(); @@ -954,7 +959,7 @@ } advancementdataplayer.a(entityplayer); -@@ -904,13 +1368,20 @@ +@@ -904,13 +1372,20 @@ } public void reload() {