aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch')
-rw-r--r--patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
new file mode 100644
index 0000000000..e5f25132df
--- /dev/null
+++ b/patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Phoenix616 <[email protected]>
+Date: Wed, 10 Jun 2020 23:55:15 +0100
+Subject: [PATCH] Inventory getHolder method without block snapshot
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+index 628e0cffa6cac6da137a25b85e86a50aec59c4b4..f3a1859a1c2adb0448186c322793585dafefe7e0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+@@ -531,6 +531,13 @@ public class CraftInventory implements Inventory {
+ return this.inventory.getOwner();
+ }
+
++ // Paper start - getHolder without snapshot
++ @Override
++ public InventoryHolder getHolder(boolean useSnapshot) {
++ return inventory instanceof net.minecraft.world.level.block.entity.BlockEntity ? ((net.minecraft.world.level.block.entity.BlockEntity) inventory).getOwner(useSnapshot) : getHolder();
++ }
++ // Paper end
++
+ @Override
+ public int getMaxStackSize() {
+ return this.inventory.getMaxStackSize();
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
+index c00c787a73b0796b645667427666b7ec4e333992..c3e2c9e2c3cbec2eda38096b6482bac1a0ea1dce 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
+@@ -63,6 +63,13 @@ public class CraftInventoryDoubleChest extends CraftInventory implements DoubleC
+ return new DoubleChest(this);
+ }
+
++ // Paper start - getHolder without snapshot
++ @Override
++ public DoubleChest getHolder(boolean useSnapshot) {
++ return getHolder();
++ }
++ // Paper end
++
+ @Override
+ public Location getLocation() {
+ return this.getLeftSide().getLocation().add(this.getRightSide().getLocation()).multiply(0.5);