2018-08-06 07:46:43 +08:00
|
|
|
From 24ecc3817771126c2d7976e868d27eed874baba7 Mon Sep 17 00:00:00 2001
|
2016-12-28 00:03:37 +08: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
|
2018-07-30 13:08:59 +08:00
|
|
|
index 9505511b14..9b1edab77d 100644
|
2016-12-28 00:03:37 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2018-07-30 13:08:59 +08:00
|
|
|
@@ -1538,7 +1538,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2016-12-28 00:03:37 +08:00
|
|
|
|
|
|
|
@Override
|
|
|
|
protected boolean isFrozen() {
|
|
|
|
- return super.isFrozen() || !getBukkitEntity().isOnline();
|
|
|
|
+ return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper
|
|
|
|
}
|
|
|
|
|
2017-08-05 11:10:30 +08:00
|
|
|
@Override
|
2016-12-28 00:03:37 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2018-07-25 16:58:03 +08:00
|
|
|
index 969e28c3b2..3885c8628c 100644
|
2016-12-28 00:03:37 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2018-07-25 16:58:03 +08:00
|
|
|
@@ -2505,7 +2505,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
2018-07-18 04:32:05 +08:00
|
|
|
}
|
2016-12-28 00:03:37 +08:00
|
|
|
|
|
|
|
public final boolean isDisconnected() {
|
|
|
|
- return !this.player.joining && !this.networkManager.isConnected();
|
|
|
|
+ return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper
|
|
|
|
}
|
2018-07-18 04:32:05 +08:00
|
|
|
// CraftBukkit end
|
2016-12-28 00:03:37 +08:00
|
|
|
}
|
|
|
|
--
|
2018-07-04 15:55:24 +08:00
|
|
|
2.18.0
|
2016-12-28 00:03:37 +08:00
|
|
|
|