mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-25 06:03:03 +02:00
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
43 lines
2.0 KiB
Diff
43 lines
2.0 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 75eb794f796b31c0c5ef80a6d27a56711a522f5e..e824fe361286a5f41b137be92d799eef54ae4b87 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
@@ -543,6 +543,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);
|