57dd397155
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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4
SPIGOT-2304: Implement LootGenerateEventa1a705ee
SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712edd
SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
58 Zeilen
1.4 KiB
Diff
58 Zeilen
1.4 KiB
Diff
From c9407327b961255a69a6c04d8771709091f81bc9 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 12 Oct 2018 03:47:26 -0500
|
|
Subject: [PATCH] Add more Witch API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
|
|
index aa88aede6..cd8d0a20e 100644
|
|
--- a/src/main/java/org/bukkit/entity/Witch.java
|
|
+++ b/src/main/java/org/bukkit/entity/Witch.java
|
|
@@ -2,8 +2,43 @@ package org.bukkit.entity;
|
|
|
|
import com.destroystokyo.paper.entity.RangedEntity;
|
|
|
|
+// Paper start
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+// Paper end
|
|
+
|
|
/**
|
|
* Represents a Witch
|
|
*/
|
|
public interface Witch extends Raider, RangedEntity { // Paper
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Check if Witch is drinking a potion
|
|
+ *
|
|
+ * @return True if drinking a potion
|
|
+ */
|
|
+ boolean isDrinkingPotion();
|
|
+
|
|
+ /**
|
|
+ * Get time remaining (in ticks) the Witch is drinking a potion
|
|
+ *
|
|
+ * @return Time remaining (in ticks)
|
|
+ */
|
|
+ int getPotionUseTimeLeft();
|
|
+
|
|
+ /**
|
|
+ * Get the potion the Witch is drinking
|
|
+ *
|
|
+ * @return The potion the witch is drinking
|
|
+ */
|
|
+ @Nullable
|
|
+ ItemStack getDrinkingPotion();
|
|
+
|
|
+ /**
|
|
+ * Set the potion the Witch should drink
|
|
+ *
|
|
+ * @param potion Potion to drink
|
|
+ */
|
|
+ void setDrinkingPotion(@Nullable ItemStack potion);
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.26.2
|
|
|