2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/TileEntityDispenser.java 2015-02-26 22:40:23.139608133 +0000
|
|
|
|
+++ src/main/java/net/minecraft/server/TileEntityDispenser.java 2015-02-26 22:40:23.139608133 +0000
|
|
|
|
@@ -2,12 +2,44 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
+import java.util.List;
|
|
|
|
+
|
|
|
|
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
|
|
+import org.bukkit.entity.HumanEntity;
|
|
|
|
+// CraftBukkit end
|
|
|
|
+
|
|
|
|
public class TileEntityDispenser extends TileEntityContainer implements IInventory {
|
|
|
|
|
|
|
|
private static final Random f = new Random();
|
|
|
|
private ItemStack[] items = new ItemStack[9];
|
|
|
|
protected String a;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - add fields and methods
|
|
|
|
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
|
|
|
|
+ private int maxStack = MAX_STACK;
|
|
|
|
+
|
|
|
|
+ public ItemStack[] getContents() {
|
|
|
|
+ return this.items;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void onOpen(CraftHumanEntity who) {
|
|
|
|
+ transaction.add(who);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void onClose(CraftHumanEntity who) {
|
|
|
|
+ transaction.remove(who);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public List<HumanEntity> getViewers() {
|
|
|
|
+ return transaction;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setMaxStackSize(int size) {
|
|
|
|
+ maxStack = size;
|
|
|
|
+ }
|
2015-02-26 23:41:06 +01:00
|
|
|
+ // CraftBukkit end
|
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public TileEntityDispenser() {}
|
|
|
|
|
2015-02-26 23:41:06 +01:00
|
|
|
public int getSize() {
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -58,6 +90,7 @@
|
|
|
|
|
|
|
|
for (int k = 0; k < this.items.length; ++k) {
|
|
|
|
if (this.items[k] != null && TileEntityDispenser.f.nextInt(j++) == 0) {
|
|
|
|
+ if (this.items[k].count == 0) continue; // CraftBukkit
|
|
|
|
i = k;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -140,7 +173,7 @@
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getMaxStackSize() {
|
|
|
|
- return 64;
|
|
|
|
+ return maxStack; // CraftBukkit
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|