Update upstream CB

This commit is contained in:
Zach Brown
2017-08-04 22:10:30 -05:00
parent 5b9437e6e2
commit 04e2290f72
3 changed files with 17 additions and 17 deletions

View File

@@ -6,7 +6,7 @@ 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 410ad5390..07b92dc0a 100644
index c861a1a59..ecf0e839a 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 {
@@ -17,7 +17,7 @@ index 410ad5390..07b92dc0a 100644
+ return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper
}
public void reset() {
@Override
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 22bc68a05..533cb281c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java