mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +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
33 lines
1019 B
Diff
33 lines
1019 B
Diff
From 4f177edca5e5517d383f03df45effcf104dd02a0 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Fri, 19 Apr 2019 12:41:19 -0500
|
|
Subject: [PATCH] Mob Spawner API Enhancements
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java
|
|
index e73fb0ef0..2ff0f24d5 100644
|
|
--- a/src/main/java/org/bukkit/block/CreatureSpawner.java
|
|
+++ b/src/main/java/org/bukkit/block/CreatureSpawner.java
|
|
@@ -199,4 +199,18 @@ public interface CreatureSpawner extends TileState {
|
|
* @param spawnRange the new spawn range
|
|
*/
|
|
public void setSpawnRange(int spawnRange);
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Check if spawner is activated (a player is close enough)
|
|
+ *
|
|
+ * @return True if a player is close enough to activate it
|
|
+ */
|
|
+ public boolean isActivated();
|
|
+
|
|
+ /**
|
|
+ * Resets the spawn delay timer within the min/max range
|
|
+ */
|
|
+ public void resetTimer();
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|