2017-05-05 01:08:52 +02:00
|
|
|
From b5ff4a771525c095c857990c97460b06d81f2b4e Mon Sep 17 00:00:00 2001
|
2016-12-27 17:03:37 +01:00
|
|
|
From: Alfie Cleveland <alfeh@me.com>
|
|
|
|
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
|
2017-04-29 02:25:52 +02:00
|
|
|
index 58d40f994..acb4469d2 100644
|
2016-12-27 17:03:37 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2017-04-29 02:25:52 +02:00
|
|
|
@@ -1346,7 +1346,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2016-12-27 17:03:37 +01:00
|
|
|
|
|
|
|
@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
|
2017-04-29 02:25:52 +02:00
|
|
|
index 437575003..7c2d43ac2 100644
|
2016-12-27 17:03:37 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2017-04-20 15:22:08 +02:00
|
|
|
@@ -2565,6 +2565,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
2016-12-27 17:03:37 +01:00
|
|
|
|
|
|
|
// 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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--
|
2017-05-05 01:08:52 +02:00
|
|
|
2.12.2
|
2016-12-27 17:03:37 +01:00
|
|
|
|