mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 22:45:31 +01:00
52a05907c7
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 Bukkit Changes: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
93 lines
3.6 KiB
Diff
93 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 37be83184cae203d5e99518b0ff5c708fafb0331..43eac972f45d1cbb6278b048f8e6d7882c0aabeb 100644
|
|
--- a/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
|
|
+++ b/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/src/main/java/org/bukkit/event/block/CampfireStartEvent.java b/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
|
|
index 2d084214e991fecc51f8e18e3d733e43b1dca248..4b12575107b3f1fa6d0ed7f667bf0d0ae40acae0 100644
|
|
--- a/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
|
|
+++ b/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/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
|
|
}
|