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

@@ -5,7 +5,7 @@ Subject: [PATCH] Call player spectator target events
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0f3be967e5..1c1c3a9b58 100644
index 251166c4fe..bf1a38eb9e 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 {