Paper/nms-patches/ContainerChest.patch

60 lines
2.0 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ContainerChest.java
+++ b/net/minecraft/server/ContainerChest.java
2016-11-17 02:41:03 +01:00
@@ -1,9 +1,37 @@
package net.minecraft.server;
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+// CraftBukkit end
2016-11-17 02:41:03 +01:00
+
public class ContainerChest extends Container {
2016-06-09 03:43:49 +02:00
private final IInventory container;
2019-04-23 04:00:00 +02:00
private final int d;
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
+ private PlayerInventory player;
+
+ @Override
+ public CraftInventoryView getBukkitView() {
+ if (bukkitEntity != null) {
+ return bukkitEntity;
+ }
+
+ CraftInventory inventory;
+ if (this.container instanceof PlayerInventory) {
+ inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryPlayer((PlayerInventory) this.container);
+ } else if (this.container instanceof InventoryLargeChest) {
+ inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) this.container);
+ } else {
+ inventory = new CraftInventory(this.container);
+ }
+
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
private ContainerChest(Containers<?> containers, int i, PlayerInventory playerinventory, int j) {
this(containers, i, playerinventory, new InventorySubcontainer(9 * j), j);
@@ -49,6 +77,10 @@
iinventory.startOpen(playerinventory.player);
int k = (this.d - 4) * 18;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - Save player
2019-04-23 04:00:00 +02:00
+ this.player = playerinventory;
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2019-04-23 04:00:00 +02:00
int l;
int i1;
2015-02-26 23:41:06 +01:00
2019-04-23 04:00:00 +02:00
@@ -72,6 +104,7 @@
2019-04-23 04:00:00 +02:00
@Override
2017-09-18 12:00:00 +02:00
public boolean canUse(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
return this.container.a(entityhuman);
}