mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-21 20:34:51 +02: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
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 49e1a0eb87be8cf0e59a9f8238fa1f8bdcebf5e0 Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Wed, 21 Dec 2016 11:47:25 -0600
|
|
Subject: [PATCH] Add API methods to control if armour stands can move
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
index d04e52fbe..387d04e5b 100644
|
|
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
@@ -271,4 +271,22 @@ public interface ArmorStand extends LivingEntity {
|
|
* @param marker whether this is a marker
|
|
*/
|
|
void setMarker(boolean marker);
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Tests if this armor stand can move.
|
|
+ *
|
|
+ * <p>The default value is {@code true}.</p>
|
|
+ *
|
|
+ * @return {@code true} if this armour stand can move, {@code false} otherwise
|
|
+ */
|
|
+ boolean canMove();
|
|
+
|
|
+ /**
|
|
+ * Sets if this armor stand can move.
|
|
+ *
|
|
+ * @param move {@code true} if this armour stand can move, {@code false} otherwise
|
|
+ */
|
|
+ void setCanMove(boolean move);
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|