mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 17:07:34 +01:00
123 lines
3.5 KiB
Diff
123 lines
3.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..fbbace36d69373046a7f3618ed5c1c1318b489b9
|
||
|
--- /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();
|
||
|
+
|
||
|
+ @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
|
||
|
+ */
|
||
|
+ @Override
|
||
|
+ public boolean isCancelled() {
|
||
|
+ return cancelled || potion == null;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ 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
|
||
|
new file mode 100644
|
||
|
index 0000000000000000000000000000000000000000..6ef6367b67261c2b653a97322b9703a9409b3499
|
||
|
--- /dev/null
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
|
||
|
@@ -0,0 +1,33 @@
|
||
|
+package com.destroystokyo.paper.event.entity;
|
||
|
+
|
||
|
+import org.bukkit.event.Cancellable;
|
||
|
+import org.bukkit.event.Event;
|
||
|
+import org.bukkit.event.HandlerList;
|
||
|
+
|
||
|
+public class WitchThrowPotionEvent extends Event implements Cancellable {
|
||
|
+ public WitchThrowPotionEvent() {
|
||
|
+ }
|
||
|
+
|
||
|
+
|
||
|
+ private static final HandlerList handlers = new HandlerList();
|
||
|
+
|
||
|
+ public HandlerList getHandlers() {
|
||
|
+ return handlers;
|
||
|
+ }
|
||
|
+
|
||
|
+ public static HandlerList getHandlerList() {
|
||
|
+ return handlers;
|
||
|
+ }
|
||
|
+
|
||
|
+ private boolean cancelled = false;
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public boolean isCancelled() {
|
||
|
+ return cancelled;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void setCancelled(boolean cancel) {
|
||
|
+ cancelled = cancel;
|
||
|
+ }
|
||
|
+}
|