From 0000000000000000000000000000000000000000 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 diff --git a/src/main/java/org/bukkit/event/block/BrewingStartEvent.java b/src/main/java/org/bukkit/event/block/BrewingStartEvent.java index 9e54ef5b60bf5583c12e1edfa76f19013a5b2a65..fe6573d8fca0aa8d8f37f8b476fc45adc786795f 100644 --- a/src/main/java/org/bukkit/event/block/BrewingStartEvent.java +++ b/src/main/java/org/bukkit/event/block/BrewingStartEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; */ 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) { @@ -36,14 +36,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/src/main/java/org/bukkit/event/block/CampfireStartEvent.java b/src/main/java/org/bukkit/event/block/CampfireStartEvent.java index 53119742beda00a38111063243665bb995ae2188..1f7a8bf65e9ac3188f759f9b3c4d6edbf255942a 100644 --- a/src/main/java/org/bukkit/event/block/CampfireStartEvent.java +++ b/src/main/java/org/bukkit/event/block/CampfireStartEvent.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; */ public class CampfireStartEvent extends InventoryBlockStartEvent { - private static final HandlerList handlers = new HandlerList(); + // Paper - remove HandlerList private int cookingTime; private CampfireRecipe campfireRecipe; @@ -49,14 +49,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/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java index d386ab5dd46cc6706ace61fe6b646713ffd50cb7..abfd0441f1dd485e59ce5a9f7fca88ffa32e87f7 100644 --- a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java +++ b/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 }