mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
9da047989c
By: md_5 <git@md-5.net>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
--- a/net/minecraft/world/inventory/ContainerChest.java
|
|
+++ b/net/minecraft/world/inventory/ContainerChest.java
|
|
@@ -6,10 +6,39 @@
|
|
import net.minecraft.world.entity.player.PlayerInventory;
|
|
import net.minecraft.world.item.ItemStack;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.InventoryLargeChest;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventory;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ContainerChest extends Container {
|
|
|
|
private final IInventory container;
|
|
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
|
|
|
|
private ContainerChest(Containers<?> containers, int i, PlayerInventory playerinventory, int j) {
|
|
this(containers, i, playerinventory, new InventorySubcontainer(9 * j), j);
|
|
@@ -55,6 +84,10 @@
|
|
iinventory.startOpen(playerinventory.player);
|
|
int k = (this.d - 4) * 18;
|
|
|
|
+ // CraftBukkit start - Save player
|
|
+ this.player = playerinventory;
|
|
+ // CraftBukkit end
|
|
+
|
|
int l;
|
|
int i1;
|
|
|
|
@@ -78,6 +111,7 @@
|
|
|
|
@Override
|
|
public boolean canUse(EntityHuman entityhuman) {
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
return this.container.a(entityhuman);
|
|
}
|
|
|