From 216d310a350a0ed6b3bc183666fbd8665c9aac91 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 7 Feb 2023 08:20:27 -0800 Subject: [PATCH] Fix HandlerList for InventoryBlockStartEvent subclasses --- .../org/bukkit/event/block/BrewingStartEvent.java | 13 ++----------- .../org/bukkit/event/block/CampfireStartEvent.java | 13 ++----------- .../event/inventory/FurnaceStartSmeltEvent.java | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java index 37be83184c..43eac972f4 100644 --- a/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; @org.jetbrains.annotations.ApiStatus.Experimental // Paper public class BrewingStartEvent extends InventoryBlockStartEvent { - private static final HandlerList handlers = new HandlerList(); + // Paper - remove HandlerList private int brewingTime; public BrewingStartEvent(@NotNull final Block furnace, @NotNull ItemStack source, int brewingTime) { @@ -37,14 +37,5 @@ public class BrewingStartEvent extends InventoryBlockStartEvent { this.brewingTime = brewTime; } - @NotNull - @Override - public HandlerList getHandlers() { - return handlers; - } - - @NotNull - public static HandlerList getHandlerList() { - return handlers; - } + // Paper - remove HandlerList } diff --git a/paper-api/src/main/java/org/bukkit/event/block/CampfireStartEvent.java b/paper-api/src/main/java/org/bukkit/event/block/CampfireStartEvent.java index 2d084214e9..4b12575107 100644 --- a/paper-api/src/main/java/org/bukkit/event/block/CampfireStartEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/block/CampfireStartEvent.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; @org.jetbrains.annotations.ApiStatus.Experimental // Paper public class CampfireStartEvent extends InventoryBlockStartEvent { - private static final HandlerList handlers = new HandlerList(); + // Paper - remove HandlerList private int cookingTime; private CampfireRecipe campfireRecipe; @@ -50,14 +50,5 @@ public class CampfireStartEvent extends InventoryBlockStartEvent { this.cookingTime = cookTime; } - @NotNull - @Override - public HandlerList getHandlers() { - return handlers; - } - - @NotNull - public static HandlerList getHandlerList() { - return handlers; - } + // Paper - remove HandlerList } diff --git a/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java index d386ab5dd4..abfd0441f1 100644 --- a/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; * {@link org.bukkit.block.Smoker}, and {@link org.bukkit.block.BlastFurnace}. */ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent { - private static final HandlerList handlers = new HandlerList(); + // Paper - remove HandlerList private final CookingRecipe recipe; private int totalCookTime; @@ -59,14 +59,5 @@ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent { this.totalCookTime = cookTime; } - @NotNull - @Override - public HandlerList getHandlers() { - return handlers; - } - - @NotNull - public static HandlerList getHandlerList() { - return handlers; - } + // Paper - remove HandlerList }