From 601c40df885b298b5a7d0d0e7ab89844d07f03fb Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sat, 19 Jun 2021 09:06:28 +0200 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 68d40318 SPIGOT-6580: Cancelling SlimeSplitEvent Causes Infinite Loop 78d93f77 SPIGOT-6576: BlockExpEvent does not show XP when breaking a furnace --- .../ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch | 2 +- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 099514bdf9..b6c7f851d7 100644 --- a/patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -292,7 +292,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java @@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit - } + j = event.getExpToDrop(); // CraftBukkit end - ExperienceOrb.award(worldserver, vec3d, j); diff --git a/work/CraftBukkit b/work/CraftBukkit index 9122f5a6e0..68d403188a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 9122f5a6e02e52b50ba61b8073137365d1167f30 +Subproject commit 68d403188aacb73c8c9d64c16e9d72e6514b0bac