2019-04-22 21:36:14 +00:00
|
|
|
From cc45f36d257d5838e9293dd0bd31353bf3950949 Mon Sep 17 00:00:00 2001
|
2016-12-27 16:03:37 +00: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
|
2019-04-22 21:36:14 +00:00
|
|
|
index 6b9bbc77c0..e4e1d999e9 100644
|
2016-12-27 16:03:37 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2019-03-20 00:28:15 +00:00
|
|
|
@@ -1567,7 +1567,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2016-12-27 16:03:37 +00:00
|
|
|
|
|
|
|
@Override
|
|
|
|
protected boolean isFrozen() {
|
|
|
|
- return super.isFrozen() || !getBukkitEntity().isOnline();
|
|
|
|
+ return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper
|
|
|
|
}
|
|
|
|
|
2017-08-05 03:10:30 +00:00
|
|
|
@Override
|
2016-12-27 16:03:37 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2019-04-22 21:36:14 +00:00
|
|
|
index 4a06527b6f..1c4842a263 100644
|
2016-12-27 16:03:37 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2019-04-22 21:36:14 +00:00
|
|
|
@@ -2485,7 +2485,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
2018-07-17 20:32:05 +00:00
|
|
|
}
|
2016-12-27 16:03:37 +00:00
|
|
|
|
|
|
|
public final boolean isDisconnected() {
|
|
|
|
- return !this.player.joining && !this.networkManager.isConnected();
|
|
|
|
+ return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper
|
|
|
|
}
|
2018-07-17 20:32:05 +00:00
|
|
|
// CraftBukkit end
|
2016-12-27 16:03:37 +00:00
|
|
|
}
|
|
|
|
--
|
2019-03-20 00:28:15 +00:00
|
|
|
2.21.0
|
2016-12-27 16:03:37 +00:00
|
|
|
|