[ci skip] Cleanup events (#10202)

patches/api/WitchReadyPotionEvent.patch

@@ -13,38 +13,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.event.entity;
 +
-+import org.bukkit.Material;
 +import org.bukkit.entity.Witch;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
 +import org.bukkit.inventory.ItemStack;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
 +public class WitchReadyPotionEvent extends EntityEvent implements Cancellable {
-+    private ItemStack potion;
 +
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
++    private ItemStack potion;
++    private boolean cancelled;
++
++    @ApiStatus.Internal
 +    public WitchReadyPotionEvent(@NotNull Witch witch, @Nullable ItemStack potion) {
 +        super(witch);
 +        this.potion = potion;
 +    }
 +
-+    /**
-+     * Fires the event, returning the desired potion, or air of cancelled
-+     * @param witch the witch whom is readying to use a potion
-+     * @param potion the potion to be used
-+     * @return The ItemStack to be used
-+     */
-+    @Nullable
-+    public static ItemStack process(@NotNull Witch witch, @Nullable ItemStack potion) {
-+        WitchReadyPotionEvent event = new WitchReadyPotionEvent(witch, potion);
-+        if (!event.callEvent() || event.getPotion() == null) {
-+            return new ItemStack(Material.AIR);
-+        }
-+        return event.getPotion();
-+    }
-+
 +    @NotNull
 +    @Override
 +    public Witch getEntity() {
@@ -56,38 +46,36 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @Nullable
 +    public ItemStack getPotion() {
-+        return potion;
++        return this.potion;
 +    }
 +
 +    /**
 +     * Sets the potion the which is going to hold and use
++     *
 +     * @param potion The potion
 +     */
 +    public void setPotion(@Nullable ItemStack potion) {
 +        this.potion = potion != null ? potion.clone() : null;
 +    }
 +
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+
-+    private boolean cancelled = false;
-+
 +    @Override
 +    public boolean isCancelled() {
-+        return cancelled;
++        return this.cancelled;
 +    }
 +
 +    @Override
 +    public void setCancelled(boolean cancel) {
-+        cancelled = cancel;
++        this.cancelled = cancel;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return HANDLER_LIST;
 +    }
 +}