bd38e0318a
Updated Upstream (Bukkit/CraftBukkit) 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: f02baa38 PR-988: Add World#getIntersectingChunks(BoundingBox) 9321d665 Move getItemInUse up to LivingEntity 819eef73 PR-959: Add access to current item's remaining ticks c4fdadb0 SPIGOT-7601: Add AbstractArrow#getItem be8261ca Add support for Java 22 26119676 PR-979: Add more translation keys 66753362 PR-985: Correct book maximum pages and characters per page documentation c8be92fa PR-980: Improve getArmorContents() documentation f1120ee2 PR-983: Expose riptide velocity to PlayerRiptideEvent CraftBukkit Changes: dfaa89bbe PR-1369: Add World#getIntersectingChunks(BoundingBox) 51bbab2b9 Move getItemInUse up to LivingEntity 668e09602 PR-1331: Add access to current item's remaining ticks a639406d1 SPIGOT-7601: Add AbstractArrow#getItem 0398930fc SPIGOT-7602: Allow opening in-world horse and related inventories ffd15611c SPIGOT-7608: Allow empty lists to morph to any PDT list 2188dcfa9 Add support for Java 22 45d6a609f SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime" 06d915943 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime ca3bc3707 PR-1361: Add more translation keys 366c3ca80 SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs 06d0f9ba8 SPIGOT-7593: Fix sapling growth physics / client-side updates 45c2608e4 PR-1366: Expose riptide velocity to PlayerRiptideEvent 29b6bb79b SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
109 Zeilen
4.6 KiB
Diff
109 Zeilen
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sun, 5 Dec 2021 14:58:55 -0500
|
|
Subject: [PATCH] Expand FallingBlock API
|
|
|
|
- add auto expire setting
|
|
- add setter for block data
|
|
- add accessors for block state
|
|
|
|
Co-authored-by: Lukas Planz <lukas.planz@web.de>
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671dc6ea9a0 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -2270,8 +2270,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
* @return The spawned {@link FallingBlock} instance
|
|
* @throws IllegalArgumentException if {@link Location} or {@link
|
|
* MaterialData} are null or {@link Material} of the {@link MaterialData} is not a block
|
|
+ * @deprecated Use {@link #spawn(Location, Class, Consumer)} (or a variation thereof) in combination with {@link FallingBlock#setBlockData(BlockData)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
|
|
|
|
/**
|
|
@@ -2284,8 +2286,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
* @return The spawned {@link FallingBlock} instance
|
|
* @throws IllegalArgumentException if {@link Location} or {@link
|
|
* BlockData} are null
|
|
+ * @deprecated Use {@link #spawn(Location, Class, Consumer)} (or a variation thereof) in combination with {@link FallingBlock#setBlockData(BlockData)}
|
|
*/
|
|
@NotNull
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete // Paper
|
|
public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException;
|
|
|
|
/**
|
|
@@ -2302,7 +2306,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
* @return The spawned {@link FallingBlock} instance
|
|
* @throws IllegalArgumentException if {@link Location} or {@link
|
|
* Material} are null or {@link Material} is not a block
|
|
- * @deprecated Magic value
|
|
+ * @deprecated Magic value. Use {@link #spawn(Location, Class, Consumer)} (or a variation thereof) in combination with {@link FallingBlock#setBlockData(BlockData)}
|
|
*/
|
|
@Deprecated
|
|
@NotNull
|
|
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
index ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9..7904c716a3b0869ebf2f9b416536c59121a539a8 100644
|
|
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
@@ -26,6 +26,33 @@ public interface FallingBlock extends Entity {
|
|
*/
|
|
@NotNull
|
|
BlockData getBlockData();
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sets the data for the falling block.
|
|
+ * <br>
|
|
+ * Any potential additional data currently stored in the falling blocks {@link #getBlockState()} will be
|
|
+ * purged by calling this setter.
|
|
+ *
|
|
+ * @param blockData the data to use as the block
|
|
+ */
|
|
+ void setBlockData(@NotNull BlockData blockData);
|
|
+
|
|
+ /**
|
|
+ * Get the data of the falling block represented as a {@link org.bukkit.block.BlockState BlockState}
|
|
+ * which includes potential NBT data that gets applied when the block gets placed on landing.
|
|
+ *
|
|
+ * @return the BlockState representing this block
|
|
+ */
|
|
+ @NotNull
|
|
+ org.bukkit.block.BlockState getBlockState();
|
|
+
|
|
+ /**
|
|
+ * Sets the {@link BlockData} and possibly present tile entity data for the falling block.
|
|
+ *
|
|
+ * @param blockState the BlockState to use
|
|
+ */
|
|
+ void setBlockState(@NotNull org.bukkit.block.BlockState blockState);
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Get if the falling block will break into an item if it cannot be placed.
|
|
@@ -137,4 +164,23 @@ public interface FallingBlock extends Entity {
|
|
default org.bukkit.Location getSourceLoc() {
|
|
return this.getOrigin();
|
|
}
|
|
+ // Paper start - Auto expire setting
|
|
+ /**
|
|
+ * Sets if this falling block should expire after:
|
|
+ * - 30 seconds
|
|
+ * - 5 seconds and is outside of the world
|
|
+ *
|
|
+ * @return if this behavior occurs
|
|
+ */
|
|
+ boolean doesAutoExpire();
|
|
+
|
|
+ /**
|
|
+ * Sets if this falling block should expire after:
|
|
+ * - 30 seconds
|
|
+ * - 5 seconds and is outside of the world
|
|
+ *
|
|
+ * @param autoExpires if this behavior should occur
|
|
+ */
|
|
+ void shouldAutoExpire(boolean autoExpires);
|
|
+ // Paper end - Auto expire setting
|
|
}
|