twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-31 12:12:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit) (#8172)

Browse Source 
Upstream has released updates that appear 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:
23f557a0 SPIGOT-5380, SPIGOT-6958, PR-772: Add some missing entity API

CraftBukkit Changes:
fc3071161 SPIGOT-5380, SPIGOT-6958, PR-1085: Add some missing entity API
This commit is contained in:
Jake Potrebic
2022-07-22 11:18:00 -07:00
parent 1e414c0753
commit d6e0ab24da
14 changed files with 66 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/api/Add-more-Witch-API.patch
View File

@@ -20,15 +20,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* 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();
@@ -0,0 +0,0 @@ public interface Witch extends Raider, RangedEntity { // Paper
* @return whether the witch is drinking a potion
*/
boolean isDrinkingPotion();
+
+ // Paper start
+ /**
+ * Get time remaining (in ticks) the Witch is drinking a potion
+ *
@@ -51,8 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ *
+ * @return The potion the witch is drinking
+ */
+ @Nullable
+ ItemStack getDrinkingPotion();
+ @Nullable ItemStack getDrinkingPotion();
+
+ /**
+ * Set the potion the Witch should drink