Update upstream B/CB

This commit is contained in:
Zach Brown
2017-03-31 23:24:42 -05:00
parent bc4e080971
commit 66a6db73e0
21 changed files with 56 additions and 56 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 485e1c3c7..d0e1de48a 100644
index 1ed1859b8..4866f9f34 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 {