Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-04-28 19:25:52 -05:00
parent d8c3e02ad6
commit 2671b8b308
22 changed files with 42 additions and 71 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 1ed1859b8..4866f9f34 100644
index b830f833f..bf3e46c35 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 {