c97ce029e9
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason <jasonpenilla2@me.com> Co-authored-by: kashike <kashike@vq.lc> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: KennyTV <kennytv@t-online.de> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
55 Zeilen
1.5 KiB
Diff
55 Zeilen
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 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 aa88aede6c4e66a608a63d07bc66d60357b0bee9..cd8d0a20e52ad35f659175e0d24a1dc0e92023b9 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
|
|
}
|