From 15909a0d10135b8cfa2062fb3df50d2277a10528 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 16 May 2018 20:26:16 -0400
Subject: [PATCH] WitchConsumePotionEvent
Fires when a witch consumes the potion in their hand
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
new file mode 100644
index 000000000..fbbace36d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
@@ -0,0 +1,70 @@
+package com.destroystokyo.paper.event.entity;
+
+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.NotNull;
+import org.jetbrains.annotations.Nullable;
+/**
+ * Fired when a witch consumes the potion in their hand to buff themselves.
+ */
+public class WitchConsumePotionEvent extends EntityEvent implements Cancellable {
+ @Nullable private ItemStack potion;
+ public WitchConsumePotionEvent(@NotNull Witch witch, @Nullable ItemStack potion) {
+ super(witch);
+ this.potion = potion;
+ }
+ @NotNull
+ @Override
+ public Witch getEntity() {
+ return (Witch) super.getEntity();
+ /**
+ * @return the potion the witch will consume and have the effects applied.
+ @Nullable
+ public ItemStack getPotion() {
+ return potion;
+ * Sets the potion to be consumed and applied to the witch.
+ * @param potion The potion
+ public void setPotion(@Nullable ItemStack potion) {
+ this.potion = potion != null ? potion.clone() : null;
+ private static final HandlerList handlers = new HandlerList();
+ public HandlerList getHandlers() {
+ return handlers;
+ public static HandlerList getHandlerList() {
+ private boolean cancelled = false;
+ * @return Event was cancelled or potion was null
+ public boolean isCancelled() {
+ return cancelled || potion == null;
+ public void setCancelled(boolean cancel) {
+ cancelled = cancel;
+}
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 000000000..6ef6367b6
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
@@ -0,0 +1,33 @@
+import org.bukkit.event.Event;
+public class WitchThrowPotionEvent extends Event implements Cancellable {
+ public WitchThrowPotionEvent() {
+ return cancelled;
--
2.25.1