mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 22:13:42 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
70 lines
1.8 KiB
Diff
70 lines
1.8 KiB
Diff
From 5eebc3f74580df0dc9f9e85de16366fcd301303c Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 7 Oct 2018 04:29:51 -0500
|
|
Subject: [PATCH] Add more Zombie API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
|
|
index 6dcac9798..fa7a43c35 100644
|
|
--- a/src/main/java/org/bukkit/entity/Zombie.java
|
|
+++ b/src/main/java/org/bukkit/entity/Zombie.java
|
|
@@ -86,4 +86,55 @@ public interface Zombie extends Monster {
|
|
* @param time new conversion time
|
|
*/
|
|
void setConversionTime(int time);
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Check if zombie is drowning
|
|
+ *
|
|
+ * @return True if zombie conversion process has begun
|
|
+ */
|
|
+ boolean isDrowning();
|
|
+
|
|
+ /**
|
|
+ * Make zombie start drowning
|
|
+ *
|
|
+ * @param drownedConversionTime Amount of time until zombie converts from drowning
|
|
+ *
|
|
+ * @deprecated See {@link #setConversionTime(int)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ void startDrowning(int drownedConversionTime);
|
|
+
|
|
+ /**
|
|
+ * Stop a zombie from starting the drowning conversion process
|
|
+ */
|
|
+ void stopDrowning();
|
|
+
|
|
+ /**
|
|
+ * Set if zombie has its arms raised
|
|
+ *
|
|
+ * @param raised True to raise arms
|
|
+ */
|
|
+ void setArmsRaised(boolean raised);
|
|
+
|
|
+ /**
|
|
+ * Check if zombie has arms raised
|
|
+ *
|
|
+ * @return True if arms are raised
|
|
+ */
|
|
+ boolean isArmsRaised();
|
|
+
|
|
+ /**
|
|
+ * Check if this zombie will burn in the sunlight
|
|
+ *
|
|
+ * @return True if zombie will burn in sunlight
|
|
+ */
|
|
+ boolean shouldBurnInDay();
|
|
+
|
|
+ /**
|
|
+ * Set if this zombie should burn in the sunlight
|
|
+ *
|
|
+ * @param shouldBurnInDay True to burn in sunlight
|
|
+ */
|
|
+ void setShouldBurnInDay(boolean shouldBurnInDay);
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|