Update upstream

This commit is contained in:
Spottedleaf
2019-05-06 17:33:26 -07:00
parent 96b32aa6bc
commit 5a6ef6ed50
23 changed files with 33 additions and 33 deletions

View File

@@ -114,7 +114,7 @@ index 8cb36ed3a4..88d0238718 100644
world.a(blockposition, false);
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 3a6ae654cc..3abf89b741 100644
index b0651a7086..6d51413d18 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.block.CraftBlock;