Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-05-27 23:25:17 -05:00
parent 914c16f3b2
commit 81159a37d4
29 changed files with 64 additions and 49 deletions

View File

@@ -19,7 +19,7 @@ index 1bb956515..e6aae7317 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 1a5e5d944..42f6b7206 100644
index a8038881d..6fdde5c07 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 {