diff options
Diffstat (limited to 'patches/api/0489-create-TileStateInventoryHolder.patch')
| -rw-r--r-- | patches/api/0489-create-TileStateInventoryHolder.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/patches/api/0489-create-TileStateInventoryHolder.patch b/patches/api/0489-create-TileStateInventoryHolder.patch index 107bd2fd51..eafc877be4 100644 --- a/patches/api/0489-create-TileStateInventoryHolder.patch +++ b/patches/api/0489-create-TileStateInventoryHolder.patch @@ -7,20 +7,21 @@ a missing interface to centralize getSnapshotInventory methods diff --git a/src/main/java/io/papermc/paper/block/TileStateInventoryHolder.java b/src/main/java/io/papermc/paper/block/TileStateInventoryHolder.java new file mode 100644 -index 0000000000000000000000000000000000000000..170a215465678024f8842e1f9f3132f8e45f213d +index 0000000000000000000000000000000000000000..59868ac52854f2e9c628f6c72ecd9fafcce15f9f --- /dev/null +++ b/src/main/java/io/papermc/paper/block/TileStateInventoryHolder.java -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +package io.papermc.paper.block; + +import org.bukkit.block.TileState; +import org.bukkit.inventory.BlockInventoryHolder; +import org.bukkit.inventory.Inventory; -+import org.checkerframework.checker.nullness.qual.NonNull; ++import org.jspecify.annotations.NullMarked; + +/** + * Represents a {@link TileState} block that has an inventory. + */ ++@NullMarked +public interface TileStateInventoryHolder extends TileState, BlockInventoryHolder { + + /** @@ -35,7 +36,7 @@ index 0000000000000000000000000000000000000000..170a215465678024f8842e1f9f3132f8 + * @return the inventory + */ + @Override -+ @NonNull Inventory getInventory(); ++ Inventory getInventory(); + + /** + * Gets the captured inventory snapshot of this container. @@ -47,7 +48,7 @@ index 0000000000000000000000000000000000000000..170a215465678024f8842e1f9f3132f8 + * + * @return the captured inventory snapshot + */ -+ @NonNull Inventory getSnapshotInventory(); ++ Inventory getSnapshotInventory(); +} diff --git a/src/main/java/org/bukkit/block/ChiseledBookshelf.java b/src/main/java/org/bukkit/block/ChiseledBookshelf.java index 1cc5c2021cf1241b090b28697e09bcd36595ab13..92f41d00dcb40fee18305502783e12d87a1c5c94 100644 |