Fix Some Meory Leaks.

Also remove LongHash "Tweaks".
2025-09-18 21:33:01 +00:00 · 2014-09-21 10:06:46 +10:00 · 2014-09-21 10:06:46 +10:00 · 23b5964225
commit 23b5964225
parent e073a27598
174 changed files with 936 additions and 437 deletions
--- a/CraftBukkit-Patches/0002-mc-dev-imports.patch
+++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch
@ -1,4 +1,4 @@
-From 4fb010dd6b5507a47f48993899029b58f863845e Mon Sep 17 00:00:00 2001
+From e7cd34f8686245a0af3ea79cc66ede494ca0420c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 15:10:48 +1100
 Subject: [PATCH] mc-dev imports
@ -1323,6 +1323,464 @@ index 0000000..2d1da33
 +        c.put(ChunkCoordinates.class, Integer.valueOf(6));
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
+new file mode 100644
+index 0000000..ace8fb3
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
+@@ -0,0 +1,360 @@
+package net.minecraft.server;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+public class EnchantmentManager {
+
+    private static final Random random = new Random();
+    private static final EnchantmentModifierProtection b = new EnchantmentModifierProtection((EmptyClass) null);
+    private static final EnchantmentModifierDamage c = new EnchantmentModifierDamage((EmptyClass) null);
+    private static final EnchantmentModifierThorns d = new EnchantmentModifierThorns((EmptyClass) null);
+    private static final EnchantmentModifierArthropods e = new EnchantmentModifierArthropods((EmptyClass) null);
+
+    public static int getEnchantmentLevel(int i, ItemStack itemstack) {
+        if (itemstack == null) {
+            return 0;
+        } else {
+            NBTTagList nbttaglist = itemstack.getEnchantments();
+
+            if (nbttaglist == null) {
+                return 0;
+            } else {
+                for (int j = 0; j < nbttaglist.size(); ++j) {
+                    short short1 = nbttaglist.get(j).getShort("id");
+                    short short2 = nbttaglist.get(j).getShort("lvl");
+
+                    if (short1 == i) {
+                        return short2;
+                    }
+                }
+
+                return 0;
+            }
+        }
+    }
+
+    public static Map a(ItemStack itemstack) {
+        LinkedHashMap linkedhashmap = new LinkedHashMap();
+        NBTTagList nbttaglist = itemstack.getItem() == Items.ENCHANTED_BOOK ? Items.ENCHANTED_BOOK.g(itemstack) : itemstack.getEnchantments();
+
+        if (nbttaglist != null) {
+            for (int i = 0; i < nbttaglist.size(); ++i) {
+                short short1 = nbttaglist.get(i).getShort("id");
+                short short2 = nbttaglist.get(i).getShort("lvl");
+
+                linkedhashmap.put(Integer.valueOf(short1), Integer.valueOf(short2));
+            }
+        }
+
+        return linkedhashmap;
+    }
+
+    public static void a(Map map, ItemStack itemstack) {
+        NBTTagList nbttaglist = new NBTTagList();
+        Iterator iterator = map.keySet().iterator();
+
+        while (iterator.hasNext()) {
+            int i = ((Integer) iterator.next()).intValue();
+            NBTTagCompound nbttagcompound = new NBTTagCompound();
+
+            nbttagcompound.setShort("id", (short) i);
+            nbttagcompound.setShort("lvl", (short) ((Integer) map.get(Integer.valueOf(i))).intValue());
+            nbttaglist.add(nbttagcompound);
+            if (itemstack.getItem() == Items.ENCHANTED_BOOK) {
+                Items.ENCHANTED_BOOK.a(itemstack, new EnchantmentInstance(i, ((Integer) map.get(Integer.valueOf(i))).intValue()));
+            }
+        }
+
+        if (nbttaglist.size() > 0) {
+            if (itemstack.getItem() != Items.ENCHANTED_BOOK) {
+                itemstack.a("ench", (NBTBase) nbttaglist);
+            }
+        } else if (itemstack.hasTag()) {
+            itemstack.getTag().remove("ench");
+        }
+    }
+
+    public static int getEnchantmentLevel(int i, ItemStack[] aitemstack) {
+        if (aitemstack == null) {
+            return 0;
+        } else {
+            int j = 0;
+            ItemStack[] aitemstack1 = aitemstack;
+            int k = aitemstack.length;
+
+            for (int l = 0; l < k; ++l) {
+                ItemStack itemstack = aitemstack1[l];
+                int i1 = getEnchantmentLevel(i, itemstack);
+
+                if (i1 > j) {
+                    j = i1;
+                }
+            }
+
+            return j;
+        }
+    }
+
+    private static void a(EnchantmentModifier enchantmentmodifier, ItemStack itemstack) {
+        if (itemstack != null) {
+            NBTTagList nbttaglist = itemstack.getEnchantments();
+
+            if (nbttaglist != null) {
+                for (int i = 0; i < nbttaglist.size(); ++i) {
+                    short short1 = nbttaglist.get(i).getShort("id");
+                    short short2 = nbttaglist.get(i).getShort("lvl");
+
+                    if (Enchantment.byId[short1] != null) {
+                        enchantmentmodifier.a(Enchantment.byId[short1], short2);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void a(EnchantmentModifier enchantmentmodifier, ItemStack[] aitemstack) {
+        ItemStack[] aitemstack1 = aitemstack;
+        int i = aitemstack.length;
+
+        for (int j = 0; j < i; ++j) {
+            ItemStack itemstack = aitemstack1[j];
+
+            a(enchantmentmodifier, itemstack);
+        }
+    }
+
+    public static int a(ItemStack[] aitemstack, DamageSource damagesource) {
+        b.a = 0;
+        b.b = damagesource;
+        a((EnchantmentModifier) b, aitemstack);
+        if (b.a > 25) {
+            b.a = 25;
+        }
+
+        return (b.a + 1 >> 1) + random.nextInt((b.a >> 1) + 1);
+    }
+
+    public static float a(EntityLiving entityliving, EntityLiving entityliving1) {
+        return a(entityliving.be(), entityliving1.getMonsterType());
+    }
+
+    public static float a(ItemStack itemstack, EnumMonsterType enummonstertype) {
+        c.a = 0.0F;
+        c.b = enummonstertype;
+        a((EnchantmentModifier) c, itemstack);
+        return c.a;
+    }
+
+    public static void a(EntityLiving entityliving, Entity entity) {
+        d.b = entity;
+        d.a = entityliving;
+        a((EnchantmentModifier) d, entityliving.getEquipment());
+        if (entity instanceof EntityHuman) {
+            a((EnchantmentModifier) d, entityliving.be());
+        }
+    }
+
+    public static void b(EntityLiving entityliving, Entity entity) {
+        e.a = entityliving;
+        e.b = entity;
+        a((EnchantmentModifier) e, entityliving.getEquipment());
+        if (entityliving instanceof EntityHuman) {
+            a((EnchantmentModifier) e, entityliving.be());
+        }
+    }
+
+    public static int getKnockbackEnchantmentLevel(EntityLiving entityliving, EntityLiving entityliving1) {
+        return getEnchantmentLevel(Enchantment.KNOCKBACK.id, entityliving.be());
+    }
+
+    public static int getFireAspectEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.FIRE_ASPECT.id, entityliving.be());
+    }
+
+    public static int getOxygenEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.OXYGEN.id, entityliving.getEquipment());
+    }
+
+    public static int getDigSpeedEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.DIG_SPEED.id, entityliving.be());
+    }
+
+    public static boolean hasSilkTouchEnchantment(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.SILK_TOUCH.id, entityliving.be()) > 0;
+    }
+
+    public static int getBonusBlockLootEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS.id, entityliving.be());
+    }
+
+    public static int getLuckEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.LUCK.id, entityliving.be());
+    }
+
+    public static int getLureEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.LURE.id, entityliving.be());
+    }
+
+    public static int getBonusMonsterLootEnchantmentLevel(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.LOOT_BONUS_MOBS.id, entityliving.be());
+    }
+
+    public static boolean hasWaterWorkerEnchantment(EntityLiving entityliving) {
+        return getEnchantmentLevel(Enchantment.WATER_WORKER.id, entityliving.getEquipment()) > 0;
+    }
+
+    public static ItemStack a(Enchantment enchantment, EntityLiving entityliving) {
+        ItemStack[] aitemstack = entityliving.getEquipment();
+        int i = aitemstack.length;
+
+        for (int j = 0; j < i; ++j) {
+            ItemStack itemstack = aitemstack[j];
+
+            if (itemstack != null && getEnchantmentLevel(enchantment.id, itemstack) > 0) {
+                return itemstack;
+            }
+        }
+
+        return null;
+    }
+
+    public static int a(Random random, int i, int j, ItemStack itemstack) {
+        Item item = itemstack.getItem();
+        int k = item.c();
+
+        if (k <= 0) {
+            return 0;
+        } else {
+            if (j > 15) {
+                j = 15;
+            }
+
+            int l = random.nextInt(8) + 1 + (j >> 1) + random.nextInt(j + 1);
+
+            return i == 0 ? Math.max(l / 3, 1) : (i == 1 ? l * 2 / 3 + 1 : Math.max(l, j * 2));
+        }
+    }
+
+    public static ItemStack a(Random random, ItemStack itemstack, int i) {
+        List list = b(random, itemstack, i);
+        boolean flag = itemstack.getItem() == Items.BOOK;
+
+        if (flag) {
+            itemstack.setItem(Items.ENCHANTED_BOOK);
+        }
+
+        if (list != null) {
+            Iterator iterator = list.iterator();
+
+            while (iterator.hasNext()) {
+                EnchantmentInstance enchantmentinstance = (EnchantmentInstance) iterator.next();
+
+                if (flag) {
+                    Items.ENCHANTED_BOOK.a(itemstack, enchantmentinstance);
+                } else {
+                    itemstack.addEnchantment(enchantmentinstance.enchantment, enchantmentinstance.level);
+                }
+            }
+        }
+
+        return itemstack;
+    }
+
+    public static List b(Random random, ItemStack itemstack, int i) {
+        Item item = itemstack.getItem();
+        int j = item.c();
+
+        if (j <= 0) {
+            return null;
+        } else {
+            j /= 2;
+            j = 1 + random.nextInt((j >> 1) + 1) + random.nextInt((j >> 1) + 1);
+            int k = j + i;
+            float f = (random.nextFloat() + random.nextFloat() - 1.0F) * 0.15F;
+            int l = (int) ((float) k * (1.0F + f) + 0.5F);
+
+            if (l < 1) {
+                l = 1;
+            }
+
+            ArrayList arraylist = null;
+            Map map = b(l, itemstack);
+
+            if (map != null && !map.isEmpty()) {
+                EnchantmentInstance enchantmentinstance = (EnchantmentInstance) WeightedRandom.a(random, map.values());
+
+                if (enchantmentinstance != null) {
+                    arraylist = new ArrayList();
+                    arraylist.add(enchantmentinstance);
+
+                    for (int i1 = l; random.nextInt(50) <= i1; i1 >>= 1) {
+                        Iterator iterator = map.keySet().iterator();
+
+                        while (iterator.hasNext()) {
+                            Integer integer = (Integer) iterator.next();
+                            boolean flag = true;
+                            Iterator iterator1 = arraylist.iterator();
+
+                            while (true) {
+                                if (iterator1.hasNext()) {
+                                    EnchantmentInstance enchantmentinstance1 = (EnchantmentInstance) iterator1.next();
+
+                                    if (enchantmentinstance1.enchantment.a(Enchantment.byId[integer.intValue()])) {
+                                        continue;
+                                    }
+
+                                    flag = false;
+                                }
+
+                                if (!flag) {
+                                    iterator.remove();
+                                }
+                                break;
+                            }
+                        }
+
+                        if (!map.isEmpty()) {
+                            EnchantmentInstance enchantmentinstance2 = (EnchantmentInstance) WeightedRandom.a(random, map.values());
+
+                            arraylist.add(enchantmentinstance2);
+                        }
+                    }
+                }
+            }
+
+            return arraylist;
+        }
+    }
+
+    public static Map b(int i, ItemStack itemstack) {
+        Item item = itemstack.getItem();
+        HashMap hashmap = null;
+        boolean flag = itemstack.getItem() == Items.BOOK;
+        Enchantment[] aenchantment = Enchantment.byId;
+        int j = aenchantment.length;
+
+        for (int k = 0; k < j; ++k) {
+            Enchantment enchantment = aenchantment[k];
+
+            if (enchantment != null && (enchantment.slot.canEnchant(item) || flag)) {
+                for (int l = enchantment.getStartLevel(); l <= enchantment.getMaxLevel(); ++l) {
+                    if (i >= enchantment.a(l) && i <= enchantment.b(l)) {
+                        if (hashmap == null) {
+                            hashmap = new HashMap();
+                        }
+
+                        hashmap.put(Integer.valueOf(enchantment.id), new EnchantmentInstance(enchantment, l));
+                    }
+                }
+            }
+        }
+
+        return hashmap;
+    }
+}
+diff --git a/src/main/java/net/minecraft/server/EnchantmentManagerDamage.java b/src/main/java/net/minecraft/server/EnchantmentManagerDamage.java
+new file mode 100644
+index 0000000..8610c7a
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/EnchantmentManagerDamage.java
+@@ -0,0 +1,17 @@
+package net.minecraft.server;
+
+final class EnchantmentModifierDamage implements EnchantmentModifier {
+
+    public float a;
+    public EnumMonsterType b;
+
+    private EnchantmentModifierDamage() {}
+
+    public void a(Enchantment enchantment, int i) {
+        this.a += enchantment.a(i, this.b);
+    }
+
+    EnchantmentModifierDamage(EmptyClass emptyclass) {
+        this();
+    }
+}
+diff --git a/src/main/java/net/minecraft/server/EnchantmentModifierArthropods.java b/src/main/java/net/minecraft/server/EnchantmentModifierArthropods.java
+new file mode 100644
+index 0000000..c8e11db
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/EnchantmentModifierArthropods.java
+@@ -0,0 +1,17 @@
+package net.minecraft.server;
+
+final class EnchantmentModifierArthropods implements EnchantmentModifier {
+
+    public EntityLiving a;
+    public Entity b;
+
+    private EnchantmentModifierArthropods() {}
+
+    public void a(Enchantment enchantment, int i) {
+        enchantment.a(this.a, this.b, i);
+    }
+
+    EnchantmentModifierArthropods(EmptyClass emptyclass) {
+        this();
+    }
+}
+diff --git a/src/main/java/net/minecraft/server/EnchantmentModifierProtection.java b/src/main/java/net/minecraft/server/EnchantmentModifierProtection.java
+new file mode 100644
+index 0000000..8c03320
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/EnchantmentModifierProtection.java
+@@ -0,0 +1,17 @@
+package net.minecraft.server;
+
+final class EnchantmentModifierProtection implements EnchantmentModifier {
+
+    public int a;
+    public DamageSource b;
+
+    private EnchantmentModifierProtection() {}
+
+    public void a(Enchantment enchantment, int i) {
+        this.a += enchantment.a(i, this.b);
+    }
+
+    EnchantmentModifierProtection(EmptyClass emptyclass) {
+        this();
+    }
+}
+diff --git a/src/main/java/net/minecraft/server/EnchantmentModifierThorns.java b/src/main/java/net/minecraft/server/EnchantmentModifierThorns.java
+new file mode 100644
+index 0000000..41993e0
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/EnchantmentModifierThorns.java
+@@ -0,0 +1,17 @@
+package net.minecraft.server;
+
+final class EnchantmentModifierThorns implements EnchantmentModifier {
+
+    public EntityLiving a;
+    public Entity b;
+
+    private EnchantmentModifierThorns() {}
+
+    public void a(Enchantment enchantment, int i) {
+        enchantment.b(this.a, this.b, i);
+    }
+
+    EnchantmentModifierThorns(EmptyClass emptyclass) {
+        this();
+    }
+}
 diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
 new file mode 100644
 index 0000000..2943244
@ -2540,6 +2998,109 @@ index 0000000..f6d7b2b
 +        this.a((PacketPlayOutListener) packetlistener);
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+new file mode 100644
+index 0000000..a9e106c
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+@@ -0,0 +1,52 @@
+package net.minecraft.server;
+
+import java.util.Collections;
+import java.util.List;
+
+public class PathfinderGoalNearestAttackableTarget extends PathfinderGoalTarget {
+
+    private final Class a;
+    private final int b;
+    private final DistanceComparator e;
+    private final IEntitySelector f;
+    private EntityLiving g;
+
+    public PathfinderGoalNearestAttackableTarget(EntityCreature entitycreature, Class oclass, int i, boolean flag) {
+        this(entitycreature, oclass, i, flag, false);
+    }
+
+    public PathfinderGoalNearestAttackableTarget(EntityCreature entitycreature, Class oclass, int i, boolean flag, boolean flag1) {
+        this(entitycreature, oclass, i, flag, flag1, (IEntitySelector) null);
+    }
+
+    public PathfinderGoalNearestAttackableTarget(EntityCreature entitycreature, Class oclass, int i, boolean flag, boolean flag1, IEntitySelector ientityselector) {
+        super(entitycreature, flag, flag1);
+        this.a = oclass;
+        this.b = i;
+        this.e = new DistanceComparator(entitycreature);
+        this.a(1);
+        this.f = new EntitySelectorNearestAttackableTarget(this, ientityselector);
+    }
+
+    public boolean a() {
+        if (this.b > 0 && this.c.aI().nextInt(this.b) != 0) {
+            return false;
+        } else {
+            double d0 = this.f();
+            List list = this.c.world.a(this.a, this.c.boundingBox.grow(d0, 4.0D, d0), this.f);
+
+            Collections.sort(list, this.e);
+            if (list.isEmpty()) {
+                return false;
+            } else {
+                this.g = (EntityLiving) list.get(0);
+                return true;
+            }
+        }
+    }
+
+    public void c() {
+        this.c.setGoalTarget(this.g);
+        super.c();
+    }
+}
+diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
+new file mode 100644
+index 0000000..5d50a86
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
+@@ -0,0 +1,39 @@
+package net.minecraft.server;
+
+public class PathfinderGoalSwell extends PathfinderGoal {
+
+    EntityCreeper a;
+    EntityLiving b;
+
+    public PathfinderGoalSwell(EntityCreeper entitycreeper) {
+        this.a = entitycreeper;
+        this.a(1);
+    }
+
+    public boolean a() {
+        EntityLiving entityliving = this.a.getGoalTarget();
+
+        return this.a.cb() > 0 || entityliving != null && this.a.f(entityliving) < 9.0D;
+    }
+
+    public void c() {
+        this.a.getNavigation().h();
+        this.b = this.a.getGoalTarget();
+    }
+
+    public void d() {
+        this.b = null;
+    }
+
+    public void e() {
+        if (this.b == null) {
+            this.a.a(-1);
+        } else if (this.a.f(this.b) > 49.0D) {
+            this.a.a(-1);
+        } else if (!this.a.getEntitySenses().canSee(this.b)) {
+            this.a.a(-1);
+        } else {
+            this.a.a(1);
+        }
+    }
+}
 diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
 new file mode 100644
 index 0000000..4684e89
--- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
@ -1,4 +1,4 @@
-From 6ef33540f17b60e923a59626dc721ab79f68e4f3 Mon Sep 17 00:00:00 2001
+From 1615ba28d80cced4ac12eb09a8598153169a791f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@ -122,7 +122,7 @@ index 7112c77..c76c3d3 100644
         if (generate) {
             // Use the default variant of loadChunk when generate == true.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6493ce7..8b599f2 100644
+index da0c78e..d02d728 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0010-LongHash-Tweaks.patch
+++ b/CraftBukkit-Patches/0010-LongHash-Tweaks.patch
@ -1,225 +0,0 @@
-From 0c3794fe2fabe95056ec884d1b83e4ac4560b699 Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Fri, 21 Jun 2013 17:13:47 +1000
-Subject: [PATCH] LongHash Tweaks
-
-Tweaks the LongHash algorithm and provides a large array based map to look up values centered around the origin, ie the access normally seen on a Minecraft server.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHash.java b/src/main/java/org/bukkit/craftbukkit/util/LongHash.java
-index 691cafd..9d54472 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/LongHash.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/LongHash.java
-@@ -10,6 +10,6 @@ public class LongHash {
-     }
- 
-     public static int lsw(long l) {
-        return (int) (l & 0xFFFFFFFF) + Integer.MIN_VALUE;
-+        return (int) (l) + Integer.MIN_VALUE; // Spigot - remove redundant &
-     }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java b/src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java
-index 22c96c5..7f659b7 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java
-@@ -31,6 +31,7 @@ public class LongHashSet {
-     private int elements;
-     private long[] values;
-     private int modCount;
-+    private org.spigotmc.FlatMap<Boolean> flat = new org.spigotmc.FlatMap<Boolean>(); // Spigot
- 
-     public LongHashSet() {
-         this(INITIAL_SIZE);
-@@ -56,10 +57,30 @@ public class LongHashSet {
-     }
- 
-     public boolean contains(int msw, int lsw) {
-+        // Spigot start
-+        if ( elements == 0 )
-+        {
-+            return false;
-+        }
-+        if ( flat.contains( msw, lsw ) )
-+        {
-+            return true;
-+        }
-+        // Spigot end
-         return contains(LongHash.toLong(msw, lsw));
-     }
- 
-     public boolean contains(long value) {
-+        // Spigot start
-+        if ( elements == 0 )
-+        {
-+            return false;
-+        }
-+        if ( flat.contains( value ) )
-+        {
-+            return true;
-+        }
-+        // Spigot end
-         int hash = hash(value);
-         int index = (hash & 0x7FFFFFFF) % values.length;
-         int offset = 1;
-@@ -82,6 +103,7 @@ public class LongHashSet {
-     }
- 
-     public boolean add(long value) {
-+        flat.put( value, Boolean.TRUE ); // Spigot
-         int hash = hash(value);
-         int index = (hash & 0x7FFFFFFF) % values.length;
-         int offset = 1;
-@@ -125,10 +147,18 @@ public class LongHashSet {
-     }
- 
-     public void remove(int msw, int lsw) {
-        remove(LongHash.toLong(msw, lsw));
-+        // Spigot start
-+        flat.remove(msw, lsw);
-+        remove0(LongHash.toLong(msw, lsw));
-     }
- 
-     public boolean remove(long value) {
-+        flat.remove(value);
-+        return remove0(value);
-+    }
-+
-+    private boolean remove0(long value) {
-+        // Spigot end
-         int hash = hash(value);
-         int index = (hash & 0x7FFFFFFF) % values.length;
-         int offset = 1;
-@@ -161,6 +191,7 @@ public class LongHashSet {
- 
-         freeEntries = values.length;
-         modCount++;
-+        flat = new org.spigotmc.FlatMap<Boolean>();
-     }
- 
-     public long[] toArray() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java b/src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java
-index 01861cc..2e5b436 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java
-@@ -28,6 +28,7 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
-     private transient V[][]    values;
-     private transient int      modCount;
-     private transient int      size;
-+    private transient org.spigotmc.FlatMap<V> flat = new org.spigotmc.FlatMap<V>(); // Spigot
- 
-     public LongObjectHashMap() {
-         initialize();
-@@ -61,6 +62,17 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
-     }
- 
-     public V get(long key) {
-+        // Spigot start
-+        if ( size == 0 )
-+        {
-+            return null;
-+        }
-+        V val = flat.get( key );
-+        if ( val != null )
-+        {
-+            return val;
-+        }
-+        // Spigot end
-         int index = (int) (keyIndex(key) & (BUCKET_SIZE - 1));
-         long[] inner = keys[index];
-         if (inner == null) return null;
-@@ -78,6 +90,7 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
-     }
- 
-     public V put(long key, V value) {
-+        flat.put(key, value); // Spigot
-         int index = (int) (keyIndex(key) & (BUCKET_SIZE - 1));
-         long[] innerKeys = keys[index];
-         V[] innerValues = values[index];
-@@ -124,6 +137,7 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
-     }
- 
-     public V remove(long key) {
-+        flat.remove(key); // Spigot
-         int index = (int) (keyIndex(key) & (BUCKET_SIZE - 1));
-         long[] inner = keys[index];
-         if (inner == null) {
-@@ -174,6 +188,7 @@ public class LongObjectHashMap<V> implements Cloneable, Serializable {
-         size = 0;
-         Arrays.fill(keys, null);
-         Arrays.fill(values, null);
-+        flat = new org.spigotmc.FlatMap<V>();
-     }
- 
-     public Set<Long> keySet() {
-diff --git a/src/main/java/org/spigotmc/FlatMap.java b/src/main/java/org/spigotmc/FlatMap.java
-new file mode 100644
-index 0000000..9416f6e
--- /dev/null
-+++ b/src/main/java/org/spigotmc/FlatMap.java
-@@ -0,0 +1,64 @@
-+package org.spigotmc;
-+
-+import org.bukkit.craftbukkit.util.LongHash;
-+
-+public class FlatMap<V>
-+{
-+
-+    private static final int FLAT_LOOKUP_SIZE = 512;
-+    private final Object[][] flatLookup = new Object[ FLAT_LOOKUP_SIZE * 2 ][ FLAT_LOOKUP_SIZE * 2 ];
-+
-+    public void put(long msw, long lsw, V value)
-+    {
-+        long acx = Math.abs( msw );
-+        long acz = Math.abs( lsw );
-+        if ( acx < FLAT_LOOKUP_SIZE && acz < FLAT_LOOKUP_SIZE )
-+        {
-+            flatLookup[(int) ( msw + FLAT_LOOKUP_SIZE )][(int) ( lsw + FLAT_LOOKUP_SIZE )] = value;
-+        }
-+    }
-+
-+    public void put(long key, V value)
-+    {
-+        put( LongHash.msw( key ), LongHash.lsw( key ), value );
-+
-+    }
-+
-+    public void remove(long key)
-+    {
-+        put( key, null );
-+    }
-+
-+    public void remove(long msw, long lsw)
-+    {
-+        put( msw, lsw, null );
-+    }
-+
-+    public boolean contains(long msw, long lsw)
-+    {
-+        return get( msw, lsw ) != null;
-+    }
-+
-+    public boolean contains(long key)
-+    {
-+        return get( key ) != null;
-+    }
-+
-+    public V get(long msw, long lsw)
-+    {
-+        long acx = Math.abs( msw );
-+        long acz = Math.abs( lsw );
-+        if ( acx < FLAT_LOOKUP_SIZE && acz < FLAT_LOOKUP_SIZE )
-+        {
-+            return (V) flatLookup[(int) ( msw + FLAT_LOOKUP_SIZE )][(int) ( lsw + FLAT_LOOKUP_SIZE )];
-+        } else
-+        {
-+            return null;
-+        }
-+    }
-+
-+    public V get(long key)
-+    {
-+        return get( LongHash.msw( key ), LongHash.lsw( key ) );
-+    }
-+}
-- 
-1.9.1
-
--- a/CraftBukkit-Patches/0011-View-Distance.patch
+++ b/CraftBukkit-Patches/0011-View-Distance.patch
@ -1,4 +1,4 @@
-From 96c3f91f9741f81bce19d0b681a8adaf05eb234f Mon Sep 17 00:00:00 2001
+From 6952058461531fbd69ae7cf8f20f324466c8731a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
--- a/CraftBukkit-Patches/0012-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch
@ -1,4 +1,4 @@
-From 6dc58e160c5b62dc3c5d6f1bb40678a44fcac26d Mon Sep 17 00:00:00 2001
+From b1561f3a4d1f9c37ebaad6f541d462edef75fa02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
--- a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@ -1,4 +1,4 @@
-From 807522ab058396ece9c943ade1698f28fb476ed0 Mon Sep 17 00:00:00 2001
+From d38127e774ae9d8c8999ae78bc6c18b0f5f33b40 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
--- a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch
+++ b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch
@ -1,4 +1,4 @@
-From 259d75f8ba67a5b5b6f8dbebf9e517c749c00d24 Mon Sep 17 00:00:00 2001
+From d1363a918a1b5e4b0b461c7d1411397a2258c59c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:20:19 +1100
 Subject: [PATCH] Handle Null Tile Entities
--- a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch
@ -1,4 +1,4 @@
-From 696c8e0e4980786ee03c711cf5681cdf11f491af Mon Sep 17 00:00:00 2001
+From 4bd1c6fdad56bcadde52e2b47a243c0ed3a519a0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
--- a/CraftBukkit-Patches/0016-Metrics.patch
+++ b/CraftBukkit-Patches/0016-Metrics.patch
@ -1,4 +1,4 @@
-From 726c32d9a80f49276d9596dc785664653cece467 Mon Sep 17 00:00:00 2001
+From 7e5e964f6f42a45c9abe3106d55bf2f7b2171a56 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 08:58:35 +1100
 Subject: [PATCH] Metrics
@ -657,7 +657,7 @@ index 0000000..d9c3b63
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a4de4e9..dc4d4b3 100644
+index 6837305..fdd4fe1 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -36,6 +36,7 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch
@ -1,4 +1,4 @@
-From e966fa6d6dc7ef524fb7285960bdcd8744e9d232 Mon Sep 17 00:00:00 2001
+From 2e8cc7b637d521ac066f4a8cdf7d4d344d160617 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:45:52 +1100
 Subject: [PATCH] PlayerItemDamageEvent
--- a/CraftBukkit-Patches/0018-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0018-Faster-UUID-for-entities.patch
@ -1,4 +1,4 @@
-From 4075f4f1be59696cbddd8df88b0f10f8fc5f41cc Mon Sep 17 00:00:00 2001
+From a78647c36c84884baae5d4d993b1b8cf78212154 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 17 Mar 2013 19:02:50 +1100
 Subject: [PATCH] Faster UUID for entities
--- a/CraftBukkit-Patches/0019-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0019-Prevent-NPE-in-CraftSign.patch
@ -1,4 +1,4 @@
-From 31decbb03eaed1acb57f79fc9a128dd806029373 Mon Sep 17 00:00:00 2001
+From 669ccaaace1c6ddbcf7a2b34db4d3a2ca53c1df0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 18 Mar 2013 20:01:44 +1100
 Subject: [PATCH] Prevent NPE in CraftSign
--- a/CraftBukkit-Patches/0020-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0020-Entity-Tracking-Ranges.patch
@ -1,4 +1,4 @@
-From 2c59fc73e053f597d163844ba2b38e54168566bc Mon Sep 17 00:00:00 2001
+From 266d1af1ddc21a23d23e043056f6ceedcd3cdb64 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges
--- a/CraftBukkit-Patches/0021-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0021-Limit-Custom-Map-Rendering.patch
@ -1,4 +1,4 @@
-From db9b904657edc497a64cf54815bc9e0a45c6e59e Mon Sep 17 00:00:00 2001
+From c07ccb86e07712b0ef1d98b1f0e43bab352e874f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 19:08:41 +1100
 Subject: [PATCH] Limit Custom Map Rendering
--- a/CraftBukkit-Patches/0022-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0022-Thread-Naming-and-Tweaks.patch
@ -1,4 +1,4 @@
-From 94171e10243a8feca65e35c70a9a4774e43c178a Mon Sep 17 00:00:00 2001
+From 6bf80259f93caf41a91b6b6a83a8d179101e08d8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
--- a/CraftBukkit-Patches/0023-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0023-Close-Unloaded-Save-Files.patch
@ -1,4 +1,4 @@
-From 321030ab9c4665edec42a775e7366ae71c7cc535 Mon Sep 17 00:00:00 2001
+From 802fb7fce4fc4a9d262cc3d6789c54981d8f62cf Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
     public static synchronized RegionFile a(File file1, int i, int j) {
         File file2 = new File(file1, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d997b48..6dc4157 100644
+index 01de2fd..0a1ffd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -85,6 +85,8 @@ import net.minecraft.server.MinecraftServer;
--- a/CraftBukkit-Patches/0024-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0024-Remove-o-Option.patch
@ -1,4 +1,4 @@
-From 6a1f16ee41738ccbf252c9ccefbf677780592a29 Mon Sep 17 00:00:00 2001
+From 1c762c2a6536944996807a0bdb9a0bfe138403ce Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option
--- a/CraftBukkit-Patches/0025-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0025-Recipe-Deconstruction.patch
@ -1,4 +1,4 @@
-From 4dd7d2d2d253da40bdf2d9fd35d5171d9d0fea92 Mon Sep 17 00:00:00 2001
+From de0f5a6cee8ef07bfd36704e2bd2b1cad437589b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction
--- a/CraftBukkit-Patches/0026-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0026-Implement-Arrow-API.patch
@ -1,4 +1,4 @@
-From 9589617ddac0217b8c431e7a87697d549876eb8f Mon Sep 17 00:00:00 2001
+From 53aff25a026136251e9028f4ec22502446d14413 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
--- a/CraftBukkit-Patches/0027-Hopper-Customisations.patch
+++ b/CraftBukkit-Patches/0027-Hopper-Customisations.patch
@ -1,4 +1,4 @@
-From 7d24f487bbcc6261883e52a027a1223ab999e5b9 Mon Sep 17 00:00:00 2001
+From e5ddbd78d9aa9a856b4d882abb6e50efd1dc751e Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Customisations
--- a/CraftBukkit-Patches/0028-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0028-Prevent-Shutdown-Hang.patch
@ -1,4 +1,4 @@
-From 94c56282c7a751537d77bb10a8fc050662fe338a Mon Sep 17 00:00:00 2001
+From 4b4a7a022f41927c5c834aac20fade7b65b32034 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
--- a/CraftBukkit-Patches/0029-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0029-Implement-SpawnerSpawnEvent.patch
@ -1,4 +1,4 @@
-From ae39328c915d12f99f3dfa349331d8c17a4653e6 Mon Sep 17 00:00:00 2001
+From 0e969f503f5076a4eb4aef9743f50eebc04bf895 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -63,7 +63,7 @@ index 93bb1ad..e39d533 100644
 
         return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2c0065d..0db8897 100644
+index 9b10c41..029652d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -41,6 +41,7 @@ import org.bukkit.Statistic.Type;
--- a/CraftBukkit-Patches/0030-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0030-Firework-Meta-Crash-Fix.patch
@ -1,4 +1,4 @@
-From 28e812c423844da20c528ce9b11b5ebd8a918754 Mon Sep 17 00:00:00 2001
+From 5279ba44c785f8accca2e2986e295bf22ab6f0a8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 15 Jun 2013 21:34:48 +1000
 Subject: [PATCH] Firework Meta Crash Fix
--- a/CraftBukkit-Patches/0031-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0031-Allow-Disabling-of-Command-Logging.patch
@ -1,11 +1,11 @@
-From abe67ad73f7f5c0d156def0bec08583d78a823d3 Mon Sep 17 00:00:00 2001
+From 2d663d5e682409b5627a216c82b7196988fc5e87 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9596da2..3a24fcd 100644
+index 69004ea..f65ff9b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -944,7 +944,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -18,7 +18,7 @@ index 9596da2..3a24fcd 100644
         CraftPlayer player = this.getPlayer();
 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6dfa8b0..c9e6dc5 100644
+index fdd4fe1..4e7d731 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -148,4 +148,10 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0032-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0032-Allow-Disabling-of-Command-TabComplete.patch
@ -1,11 +1,11 @@
-From 42d2418969eb65f19fbd37e70ce1d614c60c052d Mon Sep 17 00:00:00 2001
+From cf63180610b417c00cc49e29510bdcbd976186e0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6dc4157..fdac2f6 100644
+index 0a1ffd3..79b9459 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1698,6 +1698,13 @@ public final class CraftServer implements Server {
@ -23,7 +23,7 @@ index 6dc4157..fdac2f6 100644
         try {
             completions = getCommandMap().tabComplete(player, message.substring(1));
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index c9e6dc5..f611334 100644
+index 4e7d731..0a6ab75 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -154,4 +154,21 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0033-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0033-Configurable-Messages.patch
@ -1,4 +1,4 @@
-From 47d90f7351f706e2d7ab2705bc7eda427ce6b857 Mon Sep 17 00:00:00 2001
+From 5d5aaae38aa6061c64bc27a20962bbc137436d43 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
--- a/CraftBukkit-Patches/0034-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0034-Allow-Disabling-of-Random-Lighting-Updates.patch
@ -1,4 +1,4 @@
-From 50a56d97e571d9998e56d5b8a0342d17296c13fc Mon Sep 17 00:00:00 2001
+From c00b242f3d021f1ef263cae319e972f4c4725604 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
--- a/CraftBukkit-Patches/0035-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0035-Properly-Close-Inventories.patch
@ -1,4 +1,4 @@
-From 13bf7c59fcc316dd8adecba24c0dcbdc5b4ee654 Mon Sep 17 00:00:00 2001
+From 0a95dccc98d16e8a55740ff291befa7d48b7a36b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
--- a/CraftBukkit-Patches/0036-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0036-Disallow-Interaction-With-Self.patch
@ -1,11 +1,11 @@
-From 69835bb2783298e5849be719334d3f7884152f03 Mon Sep 17 00:00:00 2001
+From 32342872ebabacdc9d12cfdf6ab6f4a53cc701ad Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3a24fcd..cc9878f 100644
+index f65ff9b..d74c9bf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1058,6 +1058,13 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0037-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0037-Lower-Chunk-Compression.patch
@ -1,4 +1,4 @@
-From 5717bbdf08a5430b7014a788bde0cdc202f77c18 Mon Sep 17 00:00:00 2001
+From ba3c5884109ca6835fb46d0b528188101f06fbd0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:07:54 +1000
 Subject: [PATCH] Lower Chunk Compression
--- a/CraftBukkit-Patches/0038-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0038-Entity-Mount-and-Dismount-Events.patch
@ -1,4 +1,4 @@
-From eb9ab3071de9fcfaf291a6ac0e86e79833abc238 Mon Sep 17 00:00:00 2001
+From 85e794fe0deeb84644a7b0f967d65320e13913af Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
@ -35,7 +35,7 @@ index 18e4d8d..85d7665 100644
             if (this.vehicle != null) {
                 this.vehicle.passenger = null;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 03485fe..54c77f8 100644
+index 331dbac..a4e29b2 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -323,6 +323,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
--- a/CraftBukkit-Patches/0039-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0039-Prevent-Ghost-Players-Caused-by-Plugins.patch
@ -1,4 +1,4 @@
-From 44a7e0bcabdf2affdd2638c4d5ee13253352490d Mon Sep 17 00:00:00 2001
+From 6acf3b7c3ddac22824853891d7316e44d4da829b Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
--- a/CraftBukkit-Patches/0040-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0040-Plug-World-Unload-Memory-Leak.patch
@ -1,4 +1,4 @@
-From db804ccfb6c609e8cbb15a593db03cc5b542992b Mon Sep 17 00:00:00 2001
+From 42fd08bba2c31e4e5c4b54d5d22ce41737f86a99 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak
--- a/CraftBukkit-Patches/0041-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0041-Player-Collision-API.patch
@ -1,4 +1,4 @@
-From bfb15639e961d653d3ed86908db36ce3324f65fa Mon Sep 17 00:00:00 2001
+From 1db8383e0db84b163af7efd0c0ad02eba1996f5c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
--- a/CraftBukkit-Patches/0042-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0042-Fully-Disable-Snooper-When-Not-Required.patch
@ -1,11 +1,11 @@
-From b082ecfc606ef0d3f554e5edd3a37c1342c7c59c Mon Sep 17 00:00:00 2001
+From fc1e9c1bfa61d0c13d9b5c5f465f24b0952f71e2 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 523f429..a9431be 100644
+index 0a15416..da69706 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -585,11 +585,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
--- a/CraftBukkit-Patches/0043-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0043-Add-Getter-for-Entity-Invulnerability.patch
@ -1,4 +1,4 @@
-From 43f1384e6eae1c1e76e195cee7eb63d2951898e3 Mon Sep 17 00:00:00 2001
+From 937cdbbccb2d2e339f18a2d869c2e3fd2a33965e Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
--- a/CraftBukkit-Patches/0044-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0044-Cap-Minimum-Player-Speed.patch
@ -1,4 +1,4 @@
-From 4b235a101141d1b82eeca1187c71d3d9fb37a184 Mon Sep 17 00:00:00 2001
+From 34eb41a590ddbafd7942cd5b3a444ce28bbd566c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
--- a/CraftBukkit-Patches/0045-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0045-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@ -1,11 +1,11 @@
-From 607ebff4ad51575949273908f73cb1dddc531ba1 Mon Sep 17 00:00:00 2001
+From a3b1d605ad5275bf195213818f810728c6002e25 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4bde9c1..01062ce 100644
+index aeab36b..f3e4328 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -277,6 +277,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
--- a/CraftBukkit-Patches/0046-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0046-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@ -1,4 +1,4 @@
-From 4ba768774a4de3edd890f0f358adf4c513d559a7 Mon Sep 17 00:00:00 2001
+From 7f6d3c8933efad5a3f6732b3de2333b9bd41673c Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
--- a/CraftBukkit-Patches/0047-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0047-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@ -1,4 +1,4 @@
-From c1ded3f7da6746c8632b43730918a38f713dd21c Mon Sep 17 00:00:00 2001
+From e7ca2bafa020d6508d2408c0ff7ee08aa8fb52e5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
--- a/CraftBukkit-Patches/0048-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0048-Item-Despawn-Rate.patch
@ -1,4 +1,4 @@
-From 1516f2ee15c86afee40f177aafd6be011cbb8412 Mon Sep 17 00:00:00 2001
+From fe5a241e5cc741dfcb7fdbda10b3ef83624b00d6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
--- a/CraftBukkit-Patches/0049-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0049-Don-t-Special-Case-X-Move-Value.patch
@ -1,11 +1,11 @@
-From 422f1722ca154f6cc792cc86ec87cd91ae91ab30 Mon Sep 17 00:00:00 2001
+From c45bca2cd9f103649a2fc5e93ef6c15b01cb13d5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc9878f..f170ad0 100644
+index d74c9bf..234817a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -106,6 +106,7 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0050-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0050-Implement-respawn-API.patch
@ -1,4 +1,4 @@
-From 08f8db2d7755e34ca34784fcafe639ee3f781963 Mon Sep 17 00:00:00 2001
+From 5541832ab67da62a873e52835fdc02b0e8f6ca77 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
--- a/CraftBukkit-Patches/0051-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0051-Fix-BrewingStands-Removing-NBT-Potions.patch
@ -1,4 +1,4 @@
-From ec811040fba08b7084c23760094615bdf41b3e39 Mon Sep 17 00:00:00 2001
+From b7495a980cbd43d65a4e3a9d2fa9c02670fca617 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 9 Oct 2013 18:20:05 +1100
 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions
--- a/CraftBukkit-Patches/0052-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0052-Arrow-Despawn-Rate.patch
@ -1,4 +1,4 @@
-From a6c2721133c875399815dc33b31a119e0d5382f4 Mon Sep 17 00:00:00 2001
+From 5883ac826e3292b892f8d6c969fba63ece41586b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
--- a/CraftBukkit-Patches/0053-Fix-packed-ice-generation.patch
+++ b/CraftBukkit-Patches/0053-Fix-packed-ice-generation.patch
@ -1,4 +1,4 @@
-From 1655f0ec885e96045d38ab18bcfcdfc13ed0510f Mon Sep 17 00:00:00 2001
+From cb10dcfe325bd8f381b1971af41fff216cd001d1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation
--- a/CraftBukkit-Patches/0054-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0054-Watchdog-Thread.patch
@ -1,4 +1,4 @@
-From c6dabc5a4f93d00a08a7cdb8e3270342e4111b27 Mon Sep 17 00:00:00 2001
+From 9bff087bd4b90257fd6d6382a62b9e6bf8ff2861 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
@ -155,7 +155,7 @@ index 0000000..429c258
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 4a89e70..069111c 100644
+index 95bb141..c071421 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -196,4 +196,18 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0055-Clear-Flower-Pot-on-Drop.patch
+++ b/CraftBukkit-Patches/0055-Clear-Flower-Pot-on-Drop.patch
@ -1,4 +1,4 @@
-From f65a56e851df25543ce7622d5484db9828661375 Mon Sep 17 00:00:00 2001
+From 67275b8685217f95bbd98047bd91f6daa03a200a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop
--- a/CraftBukkit-Patches/0056-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0056-Fix-some-chunks-not-being-sent-to-the-client.patch
@ -1,4 +1,4 @@
-From 161cdb522267db951b26782afcb45782d21cf0b5 Mon Sep 17 00:00:00 2001
+From c9d6166a84aac1ef5f417f6d7e51995f39867b49 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client
--- a/CraftBukkit-Patches/0057-Fix-Broken-Async-Chat.patch
+++ b/CraftBukkit-Patches/0057-Fix-Broken-Async-Chat.patch
@ -1,4 +1,4 @@
-From 791420e61002cf87a890188c250e438005feb39e Mon Sep 17 00:00:00 2001
+From 10dd5460019ad9549444f0307e2bb348f46a19a2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat
--- a/CraftBukkit-Patches/0058-Remove-OS-X-Special-Chars-from-Signs.patch
+++ b/CraftBukkit-Patches/0058-Remove-OS-X-Special-Chars-from-Signs.patch
@ -1,4 +1,4 @@
-From 08607a925a2eace0f790defd40b31ef977efda43 Mon Sep 17 00:00:00 2001
+From e671c80e7fad64b51b97330d4a0c7191f026d8eb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs
--- a/CraftBukkit-Patches/0059-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0059-Orebfuscator.patch
@ -1,4 +1,4 @@
-From 7a368a07559457241a612939e55e43459c4221c8 Mon Sep 17 00:00:00 2001
+From b43cb3f2f8a4ffac4beba2eb34220576bd25c579 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
--- a/CraftBukkit-Patches/0060-Optimize-DataWatcher.patch
+++ b/CraftBukkit-Patches/0060-Optimize-DataWatcher.patch
@ -1,4 +1,4 @@
-From 3c41eceec0c93bb11b761bc6852337545d1de8ed Mon Sep 17 00:00:00 2001
+From 0496b626c8fd6ebbd195b17ba05700c5504c75be Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher
--- a/CraftBukkit-Patches/0061-Fire-PreLogin-Events-in-Offline-Mode.patch
+++ b/CraftBukkit-Patches/0061-Fire-PreLogin-Events-in-Offline-Mode.patch
@ -1,4 +1,4 @@
-From 696d751ff854fc7502dd482a471c84f15426b610 Mon Sep 17 00:00:00 2001
+From 281676537f0e69f29da6b48333f92d77863f328d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode
--- a/CraftBukkit-Patches/0062-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0062-BungeeCord-Support.patch
@ -1,4 +1,4 @@
-From c75950d95f27b4ebf18e35008248b3506b83a42b Mon Sep 17 00:00:00 2001
+From 7f6f16c8bf947441f3de17459f57a7765ab80e21 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
 Provides support for IP forwarding via BungeeCord.

 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index b98079c..ee24038 100644
+index 2b398d7..3d242f5 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -1,14 +1,17 @@
@ -156,7 +156,7 @@ index 6341b2b..01a6d66 100644
 
         if (this.j.isBanned(gameprofile) && !this.j.get(gameprofile).hasExpired()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f8e2f0f..5a08283 100644
+index 09277e9..00ce5f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -678,7 +678,13 @@ public final class CraftServer implements Server {
@ -192,7 +192,7 @@ index 1a9c381..3eafd75 100644
         {
             return getHandle().collidesWithEntities;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 069111c..7a0cb86 100644
+index c071421..47ab82f 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -210,4 +210,14 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0063-Allow-Disabling-Zombie-Villager-Aggression.patch
+++ b/CraftBukkit-Patches/0063-Allow-Disabling-Zombie-Villager-Aggression.patch
@ -1,4 +1,4 @@
-From 08426b497043f1ea5ef4ac6cd72bd794bb094ea2 Mon Sep 17 00:00:00 2001
+From 3d70f03dd843d205c5cf48cf5d56c67a4172ab01 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression
--- a/CraftBukkit-Patches/0064-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0064-Configurable-Amount-of-Netty-Threads.patch
@ -1,4 +1,4 @@
-From ae1d659c9359aa12f0a530e372a58cfb22a3fbcc Mon Sep 17 00:00:00 2001
+From dd5d81860f4cc47f970d7755ad8aa8adc1f0451f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
@ -37,7 +37,7 @@ index d596924..38d7890 100644
 
     public boolean ak() {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 7a0cb86..59ba766 100644
+index 47ab82f..865a17f 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -220,4 +220,11 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0065-Prevent-Mineshaft-Saving.patch
+++ b/CraftBukkit-Patches/0065-Prevent-Mineshaft-Saving.patch
@ -1,4 +1,4 @@
-From a5c94cb10d115a07f16fd2c4d1af8bd71a1e5746 Mon Sep 17 00:00:00 2001
+From c7b789ae27639f1e00c349e418cd707d91de7219 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving
--- a/CraftBukkit-Patches/0066-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0066-Log-Cause-of-Unexpected-Exceptions.patch
@ -1,4 +1,4 @@
-From 958e9267747d6b33c67291637a556990da6dead4 Mon Sep 17 00:00:00 2001
+From 0698d3bfe65cb7bc5fe279228ddf124ed05518a7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
--- a/CraftBukkit-Patches/0067-Particle-API.patch
+++ b/CraftBukkit-Patches/0067-Particle-API.patch
@ -1,4 +1,4 @@
-From d211691429a2f1c0c395f8b517cf3c1e22d6490c Mon Sep 17 00:00:00 2001
+From 5c08fa80afebc116a48069fc0aafab2972bd215b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
--- a/CraftBukkit-Patches/0068-Fix-Biome-Decoration-Crashes.patch
+++ b/CraftBukkit-Patches/0068-Fix-Biome-Decoration-Crashes.patch
@ -1,4 +1,4 @@
-From e773d55683c38db68d20b815fe794e30794c5294 Mon Sep 17 00:00:00 2001
+From 1f59de79f407cd95f94f98e8066db78e41fa564b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 5 Jan 2014 09:35:01 +1100
 Subject: [PATCH] Fix Biome Decoration Crashes
--- a/CraftBukkit-Patches/0069-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0069-Save-ticks-lived-to-nbttag.patch
@ -1,4 +1,4 @@
-From ce948a25b00c462c1e7385bec95b970e979d016e Mon Sep 17 00:00:00 2001
+From e0c70d71fbacff5a2bada0af71f72ec141d71a62 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
--- a/CraftBukkit-Patches/0070-More-Efficient-GetCubes.patch
+++ b/CraftBukkit-Patches/0070-More-Efficient-GetCubes.patch
@ -1,4 +1,4 @@
-From fab1432cc005200e3b0310969985bc7da82c6d10 Mon Sep 17 00:00:00 2001
+From 7e9f19ac851b839dee9fdbd7d21596bdec4e5f4d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:17:37 +1000
 Subject: [PATCH] More Efficient GetCubes
--- a/CraftBukkit-Patches/0071-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
+++ b/CraftBukkit-Patches/0071-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
@ -1,4 +1,4 @@
-From ca384413bc2987e13473c641bdc22681b2e1f033 Mon Sep 17 00:00:00 2001
+From b0a333537348a4e72d1fa95f75bd5828abfa39ed Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
--- a/CraftBukkit-Patches/0072-Warn-if-PermGen-may-be-insufficient.patch
+++ b/CraftBukkit-Patches/0072-Warn-if-PermGen-may-be-insufficient.patch
@ -1,4 +1,4 @@
-From cdb840202750bdd696263e71b1cee775fc3736e4 Mon Sep 17 00:00:00 2001
+From 24bfb75061ab7fc6a7cefa519196800aab516246 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 14:07:41 +1100
 Subject: [PATCH] Warn if PermGen may be insufficient
--- a/CraftBukkit-Patches/0073-Disable-Connected-Check-on-setScoreboard.patch
+++ b/CraftBukkit-Patches/0073-Disable-Connected-Check-on-setScoreboard.patch
@ -1,4 +1,4 @@
-From f3438244059f37f481e98cda5d03ed0137a13764 Mon Sep 17 00:00:00 2001
+From b1be536e4f947ba3f9b23a004d475d51b1245180 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
--- a/CraftBukkit-Patches/0074-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0074-Add-Late-Bind-Option.patch
@ -1,4 +1,4 @@
-From a2e57722c92a97ca75229b0e32b2eb663b5fa0d0 Mon Sep 17 00:00:00 2001
+From 5ea01961ad504b590406b8bd1c6ec938cc5416f4 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
@ -43,7 +43,7 @@ index 58e68da..6ba9c8c 100644
             }
         }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 59ba766..bfe4ec4 100644
+index 865a17f..f3187f8 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -227,4 +227,9 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0075-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0075-Allow-statistics-to-be-disabled-forced.patch
@ -1,4 +1,4 @@
-From a7a791b523e19b7dedb4cb67e0c833254d33b4ed Mon Sep 17 00:00:00 2001
+From 10a0dba99a04edb522a77cc762b25ca40d94b8a9 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced
@ -40,7 +40,7 @@ index 57a501f..cea31ae 100644
 
         super.setStatistic(entityhuman, statistic, i);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index bfe4ec4..47ab784 100644
+index f3187f8..4d43691 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -10,10 +10,12 @@ import java.util.HashMap;
--- a/CraftBukkit-Patches/0076-Fix-anvil-collisions.patch
+++ b/CraftBukkit-Patches/0076-Fix-anvil-collisions.patch
@ -1,4 +1,4 @@
-From 192c8529f2843ae0d149fb5f576892dedc3d61d2 Mon Sep 17 00:00:00 2001
+From 9e075eaa66c2e3e0dbfc38c86a1649961d1ad3c6 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 9 Jan 2014 14:19:12 +0000
 Subject: [PATCH] Fix anvil collisions
--- a/CraftBukkit-Patches/0077-Fix-ItemStack-Unbreakable-Code.patch
+++ b/CraftBukkit-Patches/0077-Fix-ItemStack-Unbreakable-Code.patch
@ -1,4 +1,4 @@
-From 6223c0d12d2aa4091dc208df10b02a860078dbf0 Mon Sep 17 00:00:00 2001
+From 8f765e831f2d41637b96a985c92e51eb64892d2a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code
--- a/CraftBukkit-Patches/0078-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0078-Try-and-Debug-Crash-Reports-Crashing.patch
@ -1,4 +1,4 @@
-From 989e873c1c02b1b3a8566c9d5b61812bc8277d58 Mon Sep 17 00:00:00 2001
+From 0046605ba9e67bdd9fdb3dd0d04306388b1f4214 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
--- a/CraftBukkit-Patches/0079-Replace-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0079-Replace-AutoSave-Mechanism.patch
@ -1,4 +1,4 @@
-From dc7ce44f000f973825590134b7c03b3fe7e33440 Mon Sep 17 00:00:00 2001
+From e0769ac61ecfbb9f0293d0886dec2bae0c24093e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Replace AutoSave Mechanism
--- a/CraftBukkit-Patches/0080-Block-data-values-that-crash-the-client.patch
+++ b/CraftBukkit-Patches/0080-Block-data-values-that-crash-the-client.patch
@ -1,4 +1,4 @@
-From 997afb5aad670c728af441e671881a5d72a76a3c Mon Sep 17 00:00:00 2001
+From 3f3e1085fd44f78727b88fd98f5c4e9f2f52eb49 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 15 Jan 2014 21:52:47 +0000
 Subject: [PATCH] Block data values that crash the client
--- a/CraftBukkit-Patches/0081-Support-vanilla-s-direction-tag-on-fireballs.patch
+++ b/CraftBukkit-Patches/0081-Support-vanilla-s-direction-tag-on-fireballs.patch
@ -1,4 +1,4 @@
-From dfedeeceb83c15c73c6295765a0a1c80d76798df Mon Sep 17 00:00:00 2001
+From 3d8f6a5aeb520d28f85da00b5535a78fef38f5a4 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 14:27:03 +0000
 Subject: [PATCH] Support vanilla's direction tag on fireballs
--- a/CraftBukkit-Patches/0082-Support-non-prefixed-URLs.patch
+++ b/CraftBukkit-Patches/0082-Support-non-prefixed-URLs.patch
@ -1,4 +1,4 @@
-From c025c5caed701fead870e2b1b71c8960156fff67 Mon Sep 17 00:00:00 2001
+From 777b10f7386c3c649c05be5a32a07817189234f5 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 19:32:42 +0000
 Subject: [PATCH] Support non-prefixed URLs
--- a/CraftBukkit-Patches/0083-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
+++ b/CraftBukkit-Patches/0083-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
@ -1,4 +1,4 @@
-From 589841bcd0393917f91f7f3754aa21f02d624ee2 Mon Sep 17 00:00:00 2001
+From 3752f78347c74688fdfeefa24b900a61910177bc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:44:07 +1100
 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
--- a/CraftBukkit-Patches/0084-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
+++ b/CraftBukkit-Patches/0084-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
@ -1,4 +1,4 @@
-From 8918932f19329e049f824f9d2a227b2b11632be2 Mon Sep 17 00:00:00 2001
+From 15d4203335146634cc8b9cd1ece7bd30fc2d5dce Mon Sep 17 00:00:00 2001
 From: Dmck2b <dmck2b+github@gmail.com>
 Date: Mon, 20 Jan 2014 20:18:23 +0000
 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
--- a/CraftBukkit-Patches/0085-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0085-Highly-Optimized-Tick-Loop.patch
@ -1,4 +1,4 @@
-From 8672c31667188f55f2ea3c1bb79eaf53be53fdf0 Mon Sep 17 00:00:00 2001
+From 0eb75591e223dd6d8886c900e3a1c3bfb96728dc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
@ -96,7 +96,7 @@ index 8ff8d9f..4c9c3a8 100644
                 this.a((CrashReport) null);
             }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 47ab784..2bc1a32 100644
+index 4d43691..d018d3f 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -261,4 +261,9 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0086-Add-Spigot-Links.patch
+++ b/CraftBukkit-Patches/0086-Add-Spigot-Links.patch
@ -1,4 +1,4 @@
-From f757f86bb893ec98ba752215c7d86503888ee3f1 Mon Sep 17 00:00:00 2001
+From c7cf6367a15ecfb0ef28d91d6da195750d17b397 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:35 +1100
 Subject: [PATCH] Add Spigot Links
--- a/CraftBukkit-Patches/0087-Configurable-Ping-Sample-Size.patch
+++ b/CraftBukkit-Patches/0087-Configurable-Ping-Sample-Size.patch
@ -1,4 +1,4 @@
-From f47dede2b93add1689c2a5f1485463f108baf5e0 Mon Sep 17 00:00:00 2001
+From 505dea36def88b69870f1489a1c228a8984d0c87 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 26 Jan 2014 21:48:34 +1100
 Subject: [PATCH] Configurable Ping Sample Size
@ -23,7 +23,7 @@ index cd06305..6423aec 100644
 
         ServerPing ping = new ServerPing();
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 2bc1a32..4ae5640 100644
+index d018d3f..878fe6b 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -266,4 +266,11 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0088-Add-Optional-Tick-Shuffling.patch
+++ b/CraftBukkit-Patches/0088-Add-Optional-Tick-Shuffling.patch
@ -1,4 +1,4 @@
-From bb3bcc39952d1d44d50321201256c03b657c3184 Mon Sep 17 00:00:00 2001
+From 40db1fc7b5f76f8b73494c0a57265eb2f34f9246 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 27 Jan 2014 08:39:26 +1100
 Subject: [PATCH] Add Optional Tick Shuffling
@ -24,7 +24,7 @@ index c2194af..1d7b814 100644
 
             while (iterator.hasNext()) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 4ae5640..153fb4f 100644
+index 878fe6b..58aea71 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -273,4 +273,10 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0089-Allow-Configuring-Chunks-per-Packet.patch
+++ b/CraftBukkit-Patches/0089-Allow-Configuring-Chunks-per-Packet.patch
@ -1,4 +1,4 @@
-From 7aba6388fe2d5d9978d89ff92bd7ff6e913c359f Mon Sep 17 00:00:00 2001
+From 8a278f085ff144b51864d174f31f503d4c8f5fc1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
--- a/CraftBukkit-Patches/0090-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0090-Implement-Locale-Getter-for-Players.patch
@ -1,4 +1,4 @@
-From 942c17e940e5eaf6d2e2e27cece7206848a1842d Mon Sep 17 00:00:00 2001
+From 0b465bbbc2e3825814ca550d8d4d0c5fc265fe27 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
--- a/CraftBukkit-Patches/0091-Cap-Entity-Collisions.patch
+++ b/CraftBukkit-Patches/0091-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From 319e6906198df64c15fa207fe467615d63f650fc Mon Sep 17 00:00:00 2001
+From 7b4a13a1809dd28e3e2c0f1fb41b98f22700dc97 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
--- a/CraftBukkit-Patches/0092-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
+++ b/CraftBukkit-Patches/0092-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
@ -1,4 +1,4 @@
-From 537e781342c1a9ec60a1f9ee291f1cf5f4c817ba Mon Sep 17 00:00:00 2001
+From e602803604770a7b28b5b4bc3b639a773bc26abc Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 6 Feb 2014 21:59:20 +0000
 Subject: [PATCH] Fix dispensing bone meal not having the correct data value
--- a/CraftBukkit-Patches/0093-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0093-Spam-Filter-Exclusions.patch
@ -1,4 +1,4 @@
-From 0ed3b8b7b11122fe6edf9d5600de9f08767b75b4 Mon Sep 17 00:00:00 2001
+From 74641feb7f15cb07719db6bd9451ef9aead6b1e6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions
@ -30,7 +30,7 @@ index c833842..daa524f 100644
                     Waitable waitable = new Waitable() {
                         @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 153fb4f..ff86680 100644
+index 58aea71..4e21046 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
--- a/CraftBukkit-Patches/0094-Add-Option-to-Silence-CommandBlock-Console.patch
+++ b/CraftBukkit-Patches/0094-Add-Option-to-Silence-CommandBlock-Console.patch
@ -1,4 +1,4 @@
-From df77a41831311f46365b93a445ee1e520c604c8f Mon Sep 17 00:00:00 2001
+From 8ca4a8a90d14a9ec9c4ae1655d8fd5cddd673715 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 9 Feb 2014 14:39:01 +1100
 Subject: [PATCH] Add Option to Silence CommandBlock Console
@ -18,7 +18,7 @@ index 0644276..84bcca1 100644
         }
 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index ff86680..731f24d 100644
+index 4e21046..15058f4 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -289,4 +289,10 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0095-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0095-Add-support-for-fetching-hidden-players.patch
@ -1,4 +1,4 @@
-From 9e1e593e8fe8186bbe9d6110dc64eae2894dde0a Mon Sep 17 00:00:00 2001
+From e08c03f5cf01e99d56ce7f599560d17a5b5aa0a4 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
--- a/CraftBukkit-Patches/0096-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0096-Allow-Disabling-Creative-Item-Filter.patch
@ -1,4 +1,4 @@
-From bbf61acf65ddf03cee535f7b8c93ad4aaf2425e7 Mon Sep 17 00:00:00 2001
+From f1e18bbd9a554e93e41bce56978acd41c32ff6c6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter
@ -18,7 +18,7 @@ index daa524f..a0157af 100644
 
             // CraftBukkit start - Call click event
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 731f24d..05c2e43 100644
+index 15058f4..37bef24 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -295,4 +295,10 @@ public class SpigotConfig
--- a/CraftBukkit-Patches/0097-Cap-Channel-Registrations.patch
+++ b/CraftBukkit-Patches/0097-Cap-Channel-Registrations.patch
@ -1,4 +1,4 @@
-From 9912527e1b90db40ea53844785f3ce8d832d046c Mon Sep 17 00:00:00 2001
+From dc6d218a78a7ab2cc3462c62c5540e5210c9c1f0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
--- a/CraftBukkit-Patches/0098-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
+++ b/CraftBukkit-Patches/0098-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
@ -1,11 +1,11 @@
-From 3482e0fb65523c96a612e0c2a57a67ca76bf241c Mon Sep 17 00:00:00 2001
+From 1d1d32cfeb02344b8105361483ad884d2f3ff383 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a08283..a235ce8 100644
+index 00ce5f0..794d771 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -120,6 +120,7 @@ import org.bukkit.command.CommandSender;
@ -138,7 +138,7 @@ index 5a08283..a235ce8 100644
     private void loadPlugin(Plugin plugin) {
         try {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 05c2e43..a299317 100644
+index 37bef24..4b79b60 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -8,8 +8,10 @@ import java.lang.reflect.Method;
--- a/CraftBukkit-Patches/0099-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0099-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@ -1,4 +1,4 @@
-From e98bb2261ecbe553d9e246ca9ebcbb659ac07140 Mon Sep 17 00:00:00 2001
+From 42077a46ee55c02e5318b4a315c8224b6e2018d8 Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
--- a/CraftBukkit-Patches/0100-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0100-Implement-Silenceable-Lightning-API.patch
@ -1,4 +1,4 @@
-From 6182a213539516f890da8bf03125138801557cbb Mon Sep 17 00:00:00 2001
+From b5b9ff44d508819f27afd220be4ccd935268a669 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
--- a/CraftBukkit-Patches/0101-Use-one-PermissibleBase-for-all-Command-Blocks.patch
+++ b/CraftBukkit-Patches/0101-Use-one-PermissibleBase-for-all-Command-Blocks.patch
@ -1,4 +1,4 @@
-From 747e4746b5b9d3655eb0a87bd0a3654997ca3e3f Mon Sep 17 00:00:00 2001
+From c1f1c91a353d47c90797f1fb80aa6d33908f1367 Mon Sep 17 00:00:00 2001
 From: FrozenBrain <carstenbamsti@googlemail.com>
 Date: Sun, 2 Mar 2014 21:13:46 +0100
 Subject: [PATCH] Use one PermissibleBase for all Command Blocks
--- a/CraftBukkit-Patches/0102-Prevent-hoppers-from-loading-chunks.patch
+++ b/CraftBukkit-Patches/0102-Prevent-hoppers-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From ac404ee520ce2042d0563a6fd0357ab78d1ccf4c Mon Sep 17 00:00:00 2001
+From aba98c5f6e50cf0e1f941f7433459cd111406e03 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 5 Mar 2014 20:27:27 +0000
 Subject: [PATCH] Prevent hoppers from loading chunks
--- a/CraftBukkit-Patches/0103-Guard-Entity-List.patch
+++ b/CraftBukkit-Patches/0103-Guard-Entity-List.patch
@ -1,4 +1,4 @@
-From 49361f99a370986b4721d342df127d43b9fdd0d9 Mon Sep 17 00:00:00 2001
+From 474cadc971e707de7beeb90122f28a870044ea64 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 10 Mar 2014 09:03:28 +1100
 Subject: [PATCH] Guard Entity List
--- a/CraftBukkit-Patches/0104-Fix-ConcurrentModificationException-while-being-idle.patch
+++ b/CraftBukkit-Patches/0104-Fix-ConcurrentModificationException-while-being-idle.patch
@ -1,4 +1,4 @@
-From 5710f95fbc5d66e22cd1054c6ffb22f5551e8cbf Mon Sep 17 00:00:00 2001
+From a802f774e7030969ffe3a6febc4dcf5a884611ad Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 14 Jan 2014 20:11:25 +0000
 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
--- a/CraftBukkit-Patches/0105-Cancellable-WitherSkull-potion-effect.patch
+++ b/CraftBukkit-Patches/0105-Cancellable-WitherSkull-potion-effect.patch
@ -1,4 +1,4 @@
-From 485cde64ee6e886850bbd26abf9f0605cc8b4061 Mon Sep 17 00:00:00 2001
+From 75faba1930ed2feb9fc967a87e26a09fb365fb8d Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect
--- a/CraftBukkit-Patches/0106-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0106-Descriptive-kick-reasons-instead-of-Nope.patch
@ -1,4 +1,4 @@
-From e6b78d72459f1affd0f92c832fa46ad249fd9879 Mon Sep 17 00:00:00 2001
+From 4717725c05e483396874323318cd793718fd9013 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
--- a/CraftBukkit-Patches/0107-Check-for-manually-prefixed-commands-or-commands-tha.patch
+++ b/CraftBukkit-Patches/0107-Check-for-manually-prefixed-commands-or-commands-tha.patch
@ -1,4 +1,4 @@
-From b6507b27adeaf9bfdd200dcbe04438f90f6d3776 Mon Sep 17 00:00:00 2001
+From 28be5a25f829f151d1864662cf5cd65d2bee63a3 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 01:12:10 +0000
 Subject: [PATCH] Check for manually prefixed commands or commands that don't
--- a/Show more
+++ b/Show more