03a4e7ac75
Upstream has released updates that appear 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: 37262de8 PR-812: Add Registry#match(String) d6b40162 SPIGOT-4569: Add more BlockData API f9691891 PR-809: Throw a more clear error for BlockIterators with zero direction, add Vector#isZero() 91e79e19 PR-804: Added methods to get translation keys for materials, itemstacks and more 426b00d3 PR-795: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 0e91ea52 SPIGOT-7224: Add events for brewing stands and campfires starting their actions CraftBukkit Changes: a50301aa5 Fix issues with fluid tag conversion and fluid #isTagged 6aeb5e4c3 SPIGOT-4569: Implement more BlockData API 7dbf862c2 PR-1131: Added methods to get translation keys for materials, itemstacks and more 7167588b1 PR-1117: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 7c44152eb SPIGOT-7224: Add events for brewing stands and campfires starting their actions
55 Zeilen
2.1 KiB
Diff
55 Zeilen
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 6 Nov 2017 21:10:01 -0500
|
|
Subject: [PATCH] API to get a BlockState without a snapshot
|
|
|
|
This allows you to get a BlockState without creating a snapshot, operating
|
|
on the real tile entity.
|
|
|
|
This is useful for where performance is needed
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..61ce341daec63392f040b70cd12662379b2f1ebd 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -272,6 +272,16 @@ public interface Block extends Metadatable, Translatable {
|
|
@NotNull
|
|
BlockState getState();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * @see #getState() optionally disables use of snapshot, to operate on real block data
|
|
+ * @param useSnapshot if this block is a TE, should we create a fully copy of the TileEntity
|
|
+ * @return BlockState with the current state of this block
|
|
+ */
|
|
+ @NotNull
|
|
+ BlockState getState(boolean useSnapshot);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Returns the biome that this block resides in
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/block/TileState.java b/src/main/java/org/bukkit/block/TileState.java
|
|
index 3b10fcc13893403b29f0260b8605144679e89b82..5c8517c5bcae10161952c104b6a4ff7c713bcdbd 100644
|
|
--- a/src/main/java/org/bukkit/block/TileState.java
|
|
+++ b/src/main/java/org/bukkit/block/TileState.java
|
|
@@ -36,4 +36,18 @@ public interface TileState extends BlockState, PersistentDataHolder {
|
|
@NotNull
|
|
@Override
|
|
PersistentDataContainer getPersistentDataContainer();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Checks if this TileState is a snapshot or a live
|
|
+ * representation of the underlying tile entity.
|
|
+ * <p>
|
|
+ * NOTE: You may still have to call {@link BlockState#update()} on
|
|
+ * live representations to update any visuals on the block.
|
|
+ *
|
|
+ * @return true if this is a snapshot
|
|
+ * @see Block#getState(boolean)
|
|
+ */
|
|
+ boolean isSnapshot();
|
|
+ // Paper end
|
|
}
|