2017-01-29 00:36:03 +01:00
|
|
|
From c84e25b7947738d4989e75b84eaf9618c499ec03 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-01-29 00:36:03 +01:00
|
|
|
index cff21dd8d..58217e55f 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-01-14 09:11:12 +01:00
|
|
|
@@ -1333,7 +1333,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-01-29 00:36:03 +01:00
|
|
|
index c6d63011d..48fc18f64 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
|
2016-12-27 19:07:43 +01:00
|
|
|
@@ -2542,6 +2542,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-01-29 00:36:03 +01:00
|
|
|
2.11.0
|
2016-12-27 17:03:37 +01:00
|
|
|
|