mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
36f34f01c0
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
93 lines
2.8 KiB
Diff
93 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 5 Jun 2018 22:47:08 -0400
|
|
Subject: [PATCH] WitchReadyPotionEvent
|
|
|
|
Control what potion the witch readies to use
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..5351b523defa054ba56ae3fb591029283ca7510d
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
|
|
@@ -0,0 +1,80 @@
|
|
+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.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+public class WitchReadyPotionEvent extends EntityEvent implements Cancellable {
|
|
+ private ItemStack potion;
|
|
+
|
|
+ public WitchReadyPotionEvent(@NotNull Witch witch, @Nullable ItemStack potion) {
|
|
+ super(witch);
|
|
+ this.potion = potion;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Fires thee 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() {
|
|
+ return (Witch) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return the potion the witch is readying to use
|
|
+ */
|
|
+ @Nullable
|
|
+ public ItemStack getPotion() {
|
|
+ return 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;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+}
|