mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
17b58d00d8
This was a useless exception wrapper that ends up making stack traces harder to read as well as the JVM cutting off the important parts Nothing catches this exception, so its safe to just get rid of it and let the REAL exception bubble down
120 lines
3.2 KiB
Diff
120 lines
3.2 KiB
Diff
From ba6dedde58f6f28c09dc1d8226c3e8269b956597 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 00000000..79021899
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
|
|
@@ -0,0 +1,64 @@
|
|
+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;
|
|
+
|
|
+/**
|
|
+ * Fired when a witch consumes the potion in their hand to buff themselves.
|
|
+ */
|
|
+public class WitchConsumePotionEvent extends EntityEvent implements Cancellable {
|
|
+ private ItemStack potion;
|
|
+
|
|
+ public WitchConsumePotionEvent(Witch witch, ItemStack potion) {
|
|
+ super(witch);
|
|
+ this.potion = potion;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Witch getEntity() {
|
|
+ return (Witch) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return the potion the witch will consume and have the effects applied.
|
|
+ */
|
|
+ public ItemStack getPotion() {
|
|
+ return potion;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the potion to be consumed and applied to the witch.
|
|
+ * @param potion The potion
|
|
+ */
|
|
+ public void setPotion(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() {
|
|
+ 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 00000000..6ef6367b
|
|
--- /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;
|
|
+ }
|
|
+}
|
|
--
|
|
2.20.1
|
|
|