From 67f81dc36eb30d0b21a79c51cd615573c492828f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 25 Jan 2020 12:10:04 -0600 Subject: [PATCH] Fix error when breaking lootable chest before populating it --- ...-Add-LootableInventoryFirstFillEvent.patch | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/patches/server/0075-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0075-Add-LootableInventoryFirstFillEvent.patch index f21bee734..227076302 100644 --- a/patches/server/0075-Add-LootableInventoryFirstFillEvent.patch +++ b/patches/server/0075-Add-LootableInventoryFirstFillEvent.patch @@ -1,24 +1,44 @@ -From 243154bb0369a788ac328dafc608775ec3c6516b Mon Sep 17 00:00:00 2001 +From ece9bf8644801ab99e2ece9c83eff7bfd3fef2d4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:43:17 -0500 Subject: [PATCH] Add LootableInventoryFirstFillEvent --- - .../paper/loottable/PaperLootableInventoryData.java | 1 + - 1 file changed, 1 insertion(+) + .../paper/loottable/PaperLootableInventoryData.java | 4 ++++ + .../paper/loottable/PaperTileEntityLootableInventory.java | 5 ++++- + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java -index b5401eaf97..25a92d4bb8 100644 +index b5401eaf9..1decf0e89 100644 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java -@@ -49,6 +49,7 @@ public class PaperLootableInventoryData { +@@ -49,6 +49,10 @@ public class PaperLootableInventoryData { // ALWAYS process the first fill or if the feature is disabled if (this.lastFill == -1 || !this.lootable.getNMSWorld().paperConfig.autoReplenishLootables) { -+ new net.pl3x.purpur.event.block.LootableInventoryFirstFillEvent(player == null ? null : (Player) player.getBukkitEntity(), lootable.getAPILootableInventory()); // Purpur ++ // Purpur start ++ LootableInventory inventory = lootable.getAPILootableInventory(); ++ if (inventory != null) new net.pl3x.purpur.event.block.LootableInventoryFirstFillEvent(player == null ? null : (Player) player.getBukkitEntity(), inventory).callEvent(); ++ // Purpur end return true; } +diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java +index d50410532..2f24e5a70 100644 +--- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java ++++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java +@@ -57,7 +57,10 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven + if (world == null) { + return null; + } +- return (LootableInventory) getBukkitWorld().getBlockAt(MCUtil.toLocation(world, tileEntityLootable.getPosition())).getState(); ++ // Purpur start ++ org.bukkit.block.BlockState state = getBukkitWorld().getBlockAt(MCUtil.toLocation(world, tileEntityLootable.getPosition())).getState(); ++ return state instanceof LootableInventory ? (LootableInventory) state : null; ++ // Purpur end + } + + @Override -- -2.24.0.rc1 +2.24.0