Merge branch 'master' into ver/1.14

This commit is contained in:
Shane Freeder
2019-05-27 01:16:47 +01:00
14 changed files with 15 additions and 46 deletions

View File

@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
documented as to their purpose.
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0c289f23b0..3c7fa3b349 100644
index a05b31f73f..79139be389 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 {