summaryrefslogtreecommitdiffstats
path: root/nms-patches/TileEntityBeacon.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-01 08:32:46 +1100
committermd_5 <git@md-5.net>2016-03-01 09:32:45 +1100
commitaa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch)
treecb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/TileEntityBeacon.patch
parente1ebe524a78e27f6a2829ed4574fded3779094e1 (diff)
downloadcraftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/TileEntityBeacon.patch')
-rw-r--r--nms-patches/TileEntityBeacon.patch23
1 files changed, 7 insertions, 16 deletions
diff --git a/nms-patches/TileEntityBeacon.patch b/nms-patches/TileEntityBeacon.patch
index 7b81e98c..f60dcd39 100644
--- a/nms-patches/TileEntityBeacon.patch
+++ b/nms-patches/TileEntityBeacon.patch
@@ -1,21 +1,21 @@
--- a/net/minecraft/server/TileEntityBeacon.java
+++ b/net/minecraft/server/TileEntityBeacon.java
-@@ -5,6 +5,11 @@
- import java.util.Iterator;
+@@ -8,6 +8,11 @@
import java.util.List;
+ import java.util.Set;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
+
- public class TileEntityBeacon extends TileEntityContainer implements IUpdatePlayerListBox, IInventory {
+ public class TileEntityBeacon extends TileEntityContainer implements ITickable, IWorldInventory {
- 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;
+ public static final MobEffectList[][] a = new MobEffectList[][] { { MobEffects.FASTER_MOVEMENT, MobEffects.FASTER_DIG}, { MobEffects.RESISTANCE, MobEffects.JUMP}, { MobEffects.INCREASE_DAMAGE}, { MobEffects.REGENERATION}};
+@@ -19,6 +24,30 @@
+ private MobEffectList m;
private ItemStack inventorySlot;
- private String n;
+ private String o;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
@@ -43,12 +43,3 @@
public TileEntityBeacon() {}
-@@ -246,7 +275,7 @@
- }
-
- public int getMaxStackSize() {
-- return 1;
-+ return maxStack; // CraftBukkit
- }
-
- public boolean a(EntityHuman entityhuman) {