42 lines
2 KiB
Diff
42 lines
2 KiB
Diff
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
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
|
|
@@ -0,0 +0,0 @@ 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);
|