2020-06-20 21:34:56 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Phoenix616 <mail@moep.tv>
|
|
|
|
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
|
2020-08-25 04:22:08 +02:00
|
|
|
index 5e0180ac658db9d7c9d90fd3d3c4eddf6f34c90d..bba9bddc1c0aacade9b7ad56afb1e630caa078fc 100644
|
2020-06-20 21:34:56 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
2020-08-25 04:22:08 +02:00
|
|
|
@@ -526,6 +526,13 @@ public class CraftInventory implements Inventory {
|
2020-06-20 21:34:56 +02:00
|
|
|
return inventory.getOwner();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - getHolder without snapshot
|
|
|
|
+ @Override
|
|
|
|
+ public InventoryHolder getHolder(boolean useSnapshot) {
|
|
|
|
+ return inventory instanceof net.minecraft.server.TileEntity ? ((net.minecraft.server.TileEntity) inventory).getOwner(useSnapshot) : getHolder();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public int getMaxStackSize() {
|
|
|
|
return 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 e917db0b01c2fef46a1ea873bee9aa25044de036..ad425d89bcae3045d0e35ecfb70a233895f88cc8 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
|
|
|
|
@@ -64,6 +64,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 getLeftSide().getLocation().add(getRightSide().getLocation()).multiply(0.5);
|