From 0000000000000000000000000000000000000000 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/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java index e6dacf68cd678d64547dcdc23b1175a4cfd279d1..5b2ae94ed7d499e401a058691eb6ed413b626150 100644 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java @@ -2069,8 +2069,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } @Override - public boolean isFrozen() { - return super.isFrozen() || !getBukkitEntity().isOnline(); + protected boolean isFrozen() { + return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper } @Override diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java index 15daf87d6a6d80b5ebce5360e6999fd604c66cb5..d507d050f9a1ebd65383adb2b21699a01d9b0385 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -2820,7 +2820,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } public final boolean isDisconnected() { - return !this.player.joining && !this.networkManager.isConnected(); + return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper } // CraftBukkit end