51 lines
2.5 KiB
Diff
51 lines
2.5 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 ef2d18d19a86b3701855aa1ac126462e663f8fcd..7ccc085228f373e6eba55d809bed480d43d5c211 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||
|
|
@@ -10,6 +10,7 @@ import net.minecraft.world.inventory.PlayerEnderChestContainer;
|
||
|
|
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
|
||
|
|
import net.minecraft.world.level.block.entity.BarrelBlockEntity;
|
||
|
|
import net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity;
|
||
|
|
+import net.minecraft.world.level.block.entity.BlockEntity;
|
||
|
|
import net.minecraft.world.level.block.entity.BrewingStandBlockEntity;
|
||
|
|
import net.minecraft.world.level.block.entity.DispenserBlockEntity;
|
||
|
|
import net.minecraft.world.level.block.entity.DropperBlockEntity;
|
||
|
|
@@ -525,6 +526,13 @@ public class CraftInventory implements Inventory {
|
||
|
|
return inventory.getOwner();
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start - getHolder without snapshot
|
||
|
|
+ @Override
|
||
|
|
+ public InventoryHolder getHolder(boolean useSnapshot) {
|
||
|
|
+ return inventory instanceof BlockEntity ? ((BlockEntity) 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 3245dfa94410d319e53543c862c990e80ed3c72d..23dcf6e9332bd2b42ebb851497483e41948355d8 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);
|