geforkt von Mirrors/Paper
36 Zeilen
1.7 KiB
Diff
36 Zeilen
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 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
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||
|
|
@@ -0,0 +0,0 @@ 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
|
||
|
|
}
|
||
|
|
|
||
|
|
public void reset() {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
|
|
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||
|
|
|
||
|
|
// 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
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.9.3 (Apple Git-75)
|
||
|
|
|