2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/ContainerDispenser.java
|
|
|
|
+++ b/net/minecraft/server/ContainerDispenser.java
|
2016-05-10 13:47:39 +02:00
|
|
|
@@ -1,13 +1,25 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
2016-05-10 13:47:39 +02:00
|
|
|
import javax.annotation.Nullable;
|
2014-11-25 22:32:16 +01:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventory;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
|
|
+// CraftBukkit end
|
2016-05-10 13:47:39 +02:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
public class ContainerDispenser extends Container {
|
|
|
|
|
2015-06-06 11:33:48 +02:00
|
|
|
public IInventory items;
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ private CraftInventoryView bukkitEntity = null;
|
|
|
|
+ private PlayerInventory player;
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
public ContainerDispenser(IInventory iinventory, IInventory iinventory1) {
|
|
|
|
this.items = iinventory1;
|
|
|
|
+ // CraftBukkit start - Save player
|
|
|
|
+ // TODO: Should we check to make sure it really is an InventoryPlayer?
|
|
|
|
+ this.player = (PlayerInventory)iinventory;
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
int i;
|
|
|
|
int j;
|
2016-05-10 13:47:39 +02:00
|
|
|
@@ -31,6 +43,7 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|
|
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
|
|
return this.items.a(entityhuman);
|
|
|
|
}
|
|
|
|
|
2016-05-10 13:47:39 +02:00
|
|
|
@@ -66,4 +79,17 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
return itemstack;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ @Override
|
|
|
|
+ public CraftInventoryView getBukkitView() {
|
|
|
|
+ if (bukkitEntity != null) {
|
|
|
|
+ return bukkitEntity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ CraftInventory inventory = new CraftInventory(this.items);
|
|
|
|
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
|
|
|
|
+ return bukkitEntity;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
}
|