testserver/Spigot-Server-Patches/0137-Properly-fix-item-dupl...

37 lines
1.5 KiB
Diff
Raw Normal View History

2019-04-27 06:26:04 +00:00
From 7e001c26638d91d2ec6eb0e510684b4284e0181f Mon Sep 17 00:00:00 2001
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-27 06:26:04 +00:00
index ecdfd306b..27ade8d7d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2019-04-27 06:26:04 +00:00
@@ -1769,7 +1769,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@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
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-04-27 06:26:04 +00:00
index 982b15dec..6874563e4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-04-27 06:26:04 +00:00
@@ -2541,7 +2541,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2018-07-17 20:32:05 +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
2019-04-27 06:26:04 +00:00
--
2.21.0