Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58e
SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579f
Add FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238
SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3
SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
58 Zeilen
1.4 KiB
Diff
58 Zeilen
1.4 KiB
Diff
From 39935bbe50ce4ad3af22bf448e7c125375791908 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.25.1
|
|
|