1 files changed, 43 insertions, 38 deletions
diff --git a/patches/api/0104-WitchThrowPotionEvent.patch b/patches/api/0104-WitchThrowPotionEvent.patch
index a5dfe42f35..6cdc1812bf 100644
--- a/patches/api/0104-WitchThrowPotionEvent.patch
+++ b/patches/api/0104-WitchThrowPotionEvent.patch
@@ -6,37 +6,41 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
-index 6ef6367b67261c2b653a97322b9703a9409b3499..688a596aa2b925651a92bf092e1ef4d77a47258c 100644
---- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..f1d546a3576a170ecb3608e07befa0f621ea043a
+--- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
-@@ -1,29 +1,77 @@
- package com.destroystokyo.paper.event.entity;
- 
+@@ -0,0 +1,85 @@
++package com.destroystokyo.paper.event.entity;
++
 +import org.bukkit.entity.LivingEntity;
 +import org.bukkit.entity.Witch;
- import org.bukkit.event.Cancellable;
--import org.bukkit.event.Event;
- import org.bukkit.event.HandlerList;
++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 WitchThrowPotionEvent extends Event implements Cancellable {
--    public WitchThrowPotionEvent() {
++
 +/**
 + * Fired when a witch throws a potion at a player
 + */
 +public class WitchThrowPotionEvent extends EntityEvent implements Cancellable {
++
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
 +    @NotNull private final LivingEntity target;
 +    @Nullable private ItemStack potion;
++    private boolean cancelled;
 +
++    @ApiStatus.Internal
 +    public WitchThrowPotionEvent(@NotNull Witch witch, @NotNull LivingEntity target, @Nullable ItemStack potion) {
 +        super(witch);
 +        this.target = target;
 +        this.potion = potion;
-     }
- 
++    }
++
 +    @NotNull
 +    @Override
 +    public Witch getEntity() {
@@ -48,7 +52,7 @@ index 6ef6367b67261c2b653a97322b9703a9409b3499..688a596aa2b925651a92bf092e1ef4d7
 +     */
 +    @NotNull
 +    public LivingEntity getTarget() {
-+        return target;
++        return this.target;
 +    }
 +
 +    /**
@@ -56,38 +60,39 @@ index 6ef6367b67261c2b653a97322b9703a9409b3499..688a596aa2b925651a92bf092e1ef4d7
 +     */
 +    @Nullable
 +    public ItemStack getPotion() {
-+        return potion;
++        return this.potion;
 +    }
 +
 +    /**
 +     * Sets the potion to be thrown at a player
++     *
 +     * @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;
- 
++
 +    /**
-+     * @return Event was cancelled or potion was null
++     * @return Event was cancelled or potion was {@code null}
 +     */
-     @Override
-     public boolean isCancelled() {
--        return cancelled;
-+        return cancelled || potion == null;
-     }
- 
-     @Override
++    @Override
++    public boolean isCancelled() {
++        return this.cancelled || this.potion == null;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return HANDLER_LIST;
++    }
++}