From b078c9b21409986a6ee694001bafa9baf17a7212 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 523d91675..60219f97c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1328,7 +1328,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { - return super.isFrozen() || !getBukkitEntity().isOnline(); + return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper } public void reset() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 441f761b9..9f721d88c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2542,6 +2542,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start - Add "isDisconnected" method public final boolean isDisconnected() { - return !this.player.joining && !this.networkManager.isConnected(); + return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper } } -- 2.11.0