Paper/Spigot-API-Patches/0162-Add-more-Witch-API.patch
Shane Freeder 0976d52bbd Updated Upstream (Bukkit/CraftBukkit/Spigot)
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

Please note that this build includes changes to meet upstreams
requirements for nullability annotations. While we aim for a level of
accuracy, these might not be 100% correct, if there are any issues,
please speak to us on discord, or open an issue on the tracker to
discuss.

Bukkit Changes:
9a6a1de3 Remove nullability annotations from enum constructors
3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API

CraftBukkit Changes:
8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep
8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals
39a287b7 Don't ignore newlines in PlayerListHeader/Footer

Spigot Changes:
cf694d87 Add nullability annotations
2019-03-20 00:31:18 +00:00

59 lines
1.5 KiB
Diff

From 3365caed03fea3f98a35b79d1a6bf10b23f652dc 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 4b27f6890..1828b2ced 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 Monster, RangedEntity { // Paper
+// Paper start
+public interface Witch extends Monster, RangedEntity {
+ /**
+ * 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.21.0