Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
c64197df SPIGOT-4584: Call events for hatching turtle eggs
f54588bd Add some missing vanilla tags
dacf8f8d Fix stray asterisk in BukkitScheduler javadocs

CraftBukkit Changes:
7fc66b28 Fix minecraft.command.selector permission
47b06d5b SPIGOT-4584: Call events for hatching turtle eggs
This commit is contained in:
Shane Freeder 2019-01-18 22:34:02 +00:00
parent 0d458bd338
commit 94bdfbd197
3 changed files with 3 additions and 3 deletions

View File

@ -40,7 +40,7 @@ index 75622fbdf8..2653699840 100644
entityirongolem.setPlayerCreated(true); entityirongolem.setPlayerCreated(true);
entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F); entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index d2cc6bbe25..b180772ae8 100644 index 0f0872c1e0..1c1bf85a0e 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -0,0 +0,0 @@ public class BlockTurtleEgg extends Block { @@ -0,0 +0,0 @@ public class BlockTurtleEgg extends Block {

@ -1 +1 @@
Subproject commit 18cda9366dd97fc5e757254737786a81d9b69951 Subproject commit c64197df528c2e6aef9a2404bf24b08a330fefc9

@ -1 +1 @@
Subproject commit 0c715b32b02a156fc72dadebe0d6ee1be7344f98 Subproject commit 7fc66b28db41ab1b677d513b2cf21e1cb948e4e1