1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
--- /home/matt/mc-dev-private//net/minecraft/server/TileEntityBeacon.java 2015-02-26 22:40:23.119608134 +0000
+++ src/main/java/net/minecraft/server/TileEntityBeacon.java 2015-02-26 22:40:23.119608134 +0000
@@ -5,6 +5,11 @@
import java.util.Iterator;
import java.util.List;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
+
public class TileEntityBeacon extends TileEntityContainer implements IUpdatePlayerListBox, IInventory {
public static final MobEffectList[][] a = new MobEffectList[][] { { MobEffectList.FASTER_MOVEMENT, MobEffectList.FASTER_DIG}, { MobEffectList.RESISTANCE, MobEffectList.JUMP}, { MobEffectList.INCREASE_DAMAGE}, { MobEffectList.REGENERATION}};
@@ -15,6 +20,30 @@
private int l;
private ItemStack inventorySlot;
private String n;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+
+ public ItemStack[] getContents() {
+ return new ItemStack[] { this.inventorySlot };
+ }
+
+ 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;
+ }
+ // CraftBukkit end
public TileEntityBeacon() {}
@@ -169,8 +198,8 @@
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
- this.k = nbttagcompound.getInt("Primary");
- this.l = nbttagcompound.getInt("Secondary");
+ this.k = validateEffect(nbttagcompound.getInt("Primary")); // CraftBukkit
+ this.l = validateEffect(nbttagcompound.getInt("Secondary")); // CraftBukkit
this.j = nbttagcompound.getInt("Levels");
}
@@ -236,7 +265,7 @@
}
public int getMaxStackSize() {
- return 1;
+ return maxStack; // CraftBukkit
}
public boolean a(EntityHuman entityhuman) {
@@ -282,11 +311,11 @@
break;
case 1:
- this.k = j;
+ this.k = validateEffect(j);
break;
case 2:
- this.l = j;
+ this.l = validateEffect(j);
}
}
@@ -326,4 +355,23 @@
return this.a;
}
}
+
+ // CraftBukkit start
+ public int validateEffect(int i) {
+ i = i < 0 || i >= MobEffectList.byId.length || MobEffectList.byId[i] == null ? 0 : i;
+ switch (i) {
+ case 1: // MobEffectList.FASTER_MOVEMENT.id
+ case 3: // MobEffectList.FASTER_DIG.id
+ case 11: // MobEffectList.RESISTANCE.id
+ case 8: // MobEffectList.JUMP.id
+ case 5: // MobEffectList.INCREASE_DAMAGE.id
+ case 10: // MobEffectList.REGENERATION.id
+ break;
+ default:
+ i = 0;
+ break;
+ }
+ return i;
+ }
+ // CraftBukkit end
}
|
