From 9b05677eefcf2473295f70dedebb85e8e7ebea56 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 18 Jan 2019 22:34:02 +0000 Subject: [PATCH] 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 --- .../0394-Use-EntityTypes-for-living-entities.patch | 6 +++--- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch index 96b8bee4b..234aa18dc 100644 --- a/Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch +++ b/Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch @@ -1,4 +1,4 @@ -From 1e922622fd78c8c72f5976328018d4763b3c1be4 Mon Sep 17 00:00:00 2001 +From 6c1086be992ef85a818bcc95d63fb3e0e460e6ff Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 4 Oct 2018 10:08:02 -0500 Subject: [PATCH] Use EntityTypes for living entities @@ -40,10 +40,10 @@ index 75622fbdf8..2653699840 100644 entityirongolem.setPlayerCreated(true); 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 -index d2cc6bbe25..b180772ae8 100644 +index 0f0872c1e0..1c1bf85a0e 100644 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java -@@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block { +@@ -94,7 +94,7 @@ public class BlockTurtleEgg extends Block { if (!world.isClientSide) { for (int j = 0; j < (Integer) iblockdata.get(BlockTurtleEgg.b); ++j) { world.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata)); diff --git a/work/Bukkit b/work/Bukkit index 18cda9366..c64197df5 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 18cda9366dd97fc5e757254737786a81d9b69951 +Subproject commit c64197df528c2e6aef9a2404bf24b08a330fefc9 diff --git a/work/CraftBukkit b/work/CraftBukkit index 0c715b32b..7fc66b28d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 0c715b32b02a156fc72dadebe0d6ee1be7344f98 +Subproject commit 7fc66b28db41ab1b677d513b2cf21e1cb948e4e1