Update from upstream SpigotMC

6669d6ecd2b b2740df50bb bf71dc61149 fba27a2ea80 92ee7e7f8ec b28f0d3de23 4beb4ac3918 0ddb6f3dde8 afe301fe892 b8f6402bbbe
2014-12-07 13:26:30 -06:00 · 2014-12-07 13:26:30 -06:00 · 28414e7e28
commit 28414e7e28
parent ff120ea055
38 changed files with 140 additions and 158 deletions
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@ -1,11 +1,11 @@
-From 626a7293d8a78d0aa5383605240d53a57f93dd53 Mon Sep 17 00:00:00 2001
+From ecda9a1d2be3ef373f18043aeb95e4da04c1aebd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes


 diff --git a/pom.xml b/pom.xml
-index ed69653..87c0c58 100644
+index 5cecb1e..eedbc20 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -1,15 +1,29 @@
@ -39,9 +39,9 @@ index ed69653..87c0c58 100644
 +        </repository>
 +    </repositories>
 +
-     <build>
-         <plugins>
-             <plugin>
+     <distributionManagement>
+         <repository>
+             <id>spigotmc-releases</id>
 -- 
 2.1.0

--- a/Bukkit-Patches/0009-Update-Depends.patch
+++ b/Bukkit-Patches/0009-Update-Depends.patch
@ -1,4 +1,4 @@
-From a1d01997d5b3c29406f889a50e6d1abe333ab56d Mon Sep 17 00:00:00 2001
+From fa35c0b59b538ef892de56bb7cb8eb3b190b3831 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 20:05:19 +1000
 Subject: [PATCH] Update Depends
@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends
 - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.

 diff --git a/pom.xml b/pom.xml
-index 87c0c58..072f84d 100644
+index 1324616..bd70b0d 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -83,21 +83,21 @@
+@@ -94,21 +94,21 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
@ -34,7 +34,7 @@ index 87c0c58..072f84d 100644
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-@@ -112,7 +112,7 @@
+@@ -123,7 +123,7 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@ -1,4 +1,4 @@
-From 80cd16f04a4511aff368dbe080503feb517aeb80 Mon Sep 17 00:00:00 2001
+From b8c7995e487a20b69ee32985463571acbd2673c5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@ -124,10 +124,10 @@ index 3b9bfec..e4d0e41 100644
 +    // Spigot end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 1f7b523..651f81c 100644
+index 661fbae..92a6270 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -666,4 +666,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -667,4 +667,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
     public final String toString() {
         return SerializableMeta.classMap.get(getClass()) + "_META:" + serialize(); // TODO: cry
     }
--- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
@ -1,4 +1,4 @@
-From 0b5076af3d1f7517fd27ffb01174908a0cc24fe6 Mon Sep 17 00:00:00 2001
+From 732e6fef011332a8b83362216399ccd58e4b7f8d 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
@ -46,7 +46,7 @@ index c9058db..350f2f7 100644
             EntityPlayer entityplayer = (EntityPlayer) entity;
             Iterator iterator = this.c.iterator();
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 7c58740..f5d518f 100644
+index 1204c56..640d7ff 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -308,6 +308,7 @@ public class EntityTrackerEntry {
@ -57,7 +57,7 @@ index 7c58740..f5d518f 100644
         if (entityplayer != this.tracker) {
             if (this.c(entityplayer)) {
                 if (!this.trackedPlayers.contains(entityplayer) && (this.e(entityplayer) || this.tracker.attachedToPlayer)) {                    
-@@ -536,6 +537,7 @@ public class EntityTrackerEntry {
+@@ -538,6 +539,7 @@ public class EntityTrackerEntry {
     }
 
     public void clear(EntityPlayer entityplayer) {
@ -66,7 +66,7 @@ index 7c58740..f5d518f 100644
             this.trackedPlayers.remove(entityplayer);
             entityplayer.d(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 703cf73..b25c672 100644
+index f953e08..3fb0636 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -891,6 +891,7 @@ public abstract class World implements IBlockAccess {
@ -94,7 +94,7 @@ index 703cf73..b25c672 100644
         // this.entityList.addAll(collection);
         Iterator iterator = collection.iterator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 17d24ce..a45f2a3 100644
+index 8d28b9a..80f84a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -162,6 +162,7 @@ public class CraftWorld implements World {
--- a/CraftBukkit-Patches/0012-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch
@ -1,4 +1,4 @@
-From 444fbb732d8b26b71369fac046fb382bbbe222ee Mon Sep 17 00:00:00 2001
+From 205584cab09286718c021a5629b3f4a76b67a723 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
@ -367,10 +367,10 @@ index 5e53661..49429d7 100644
         this.methodProfiler.b();
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2235ba4..1950abf 100644
+index 0d384bb..491b5f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1009,6 +1009,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1032,6 +1032,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
     // CraftBukkit end
 
     private void handleCommand(String s) {
@ -379,7 +379,7 @@ index 2235ba4..1950abf 100644
        // CraftBukkit start - whole method
         this.c.info(this.player.getName() + " issued server command: " + s);
 
-@@ -1018,18 +1020,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1041,18 +1043,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         this.server.getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
--- a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch
@ -1,4 +1,4 @@
-From f7ebeca13ae1e54ffcc844911f14e4a037f14f1f Mon Sep 17 00:00:00 2001
+From b98d6a30325852e7362c7d74b1ebf300702d662b 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
@ -145,7 +145,7 @@ index 8357157..16400c3 100644
         super(world);
         this.a(0.25F, 0.25F);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 803b5df..86474de 100644
+index 803b5df..a58e4eb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -83,6 +83,13 @@ public abstract class EntityLiving extends Entity {
@ -156,14 +156,14 @@ index 803b5df..86474de 100644
 +    public void inactiveTick()
 +    {
 +        super.inactiveTick();
-+        ++this.aT; // Above all the floats
+        ++this.aO; // Above all the floats
 +    }
 +    // Spigot end
 
     public void G() {
         this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0584909..e5da9db 100644
+index 7fd8375..f1e18af 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1256,6 +1256,7 @@ public abstract class World implements IBlockAccess {
@ -205,7 +205,7 @@ index 558574f..41d2d87 100644
     public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
 new file mode 100644
-index 0000000..3505475
+index 0000000..cfabc25
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +1,283 @@
@ -433,7 +433,7 @@ index 0000000..3505475
 +            if ( entity instanceof EntityAnimal )
 +            {
 +                EntityAnimal animal = (EntityAnimal) entity;
-+                if ( animal.isBaby() || animal.ce() /*love*/ )
+                if ( animal.isBaby() || animal.cp() /*love*/ )
 +                {
 +                    return true;
 +                }
@ -513,5 +513,5 @@ index 46249d7..ed2836a 100644
 +    }
 }
 -- 
-1.9.1
+2.1.0

--- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch
@ -1,14 +1,14 @@
-From 7efe54f5803c0ccec23d7b5da399a23080cd8efc Mon Sep 17 00:00:00 2001
+From 0b7f9ce9fdbc33a17dd99d38b358084fb6c67a6e 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 c7d4f9f..1160b6e 100644
+index 491b5f0..7f8b0fc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1012,6 +1012,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1035,6 +1035,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
 
        // CraftBukkit start - whole method
--- a/CraftBukkit-Patches/0030-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0030-Configurable-Messages.patch
@ -1,4 +1,4 @@
-From fa69a6cc11be682af6522f276ec6011ab3db5251 Mon Sep 17 00:00:00 2001
+From e825b9f61e1063c007b06771c7baaa01f073473e 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
@ -23,10 +23,10 @@ index f8bac48..e036bc6 100644
                 this.b.close(chatcomponenttext);
             } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b55a7a5..7f1fcaa 100644
+index 5979c78..80123ee 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -357,7 +357,7 @@ public abstract class PlayerList {
+@@ -378,7 +378,7 @@ public abstract class PlayerList {
             event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
         } else if (!this.isWhitelisted(gameprofile)) {
             // return "You are not white-listed on this server!";
@ -35,7 +35,7 @@ index b55a7a5..7f1fcaa 100644
         } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
             IpBanEntry ipbanentry = this.l.get(socketaddress);
 
-@@ -371,7 +371,7 @@ public abstract class PlayerList {
+@@ -392,7 +392,7 @@ public abstract class PlayerList {
         } else {
             // return this.players.size() >= this.maxPlayers ? "The server is full!" : null;
             if (this.players.size() >= this.maxPlayers) {
--- a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch
@ -1,14 +1,14 @@
-From 148863cb57e94a6063ffaeebd8c321f8807d01dc Mon Sep 17 00:00:00 2001
+From 7dac437336bc9676d51a006e30e17f4634272a26 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 1160b6e..5e5e6ba 100644
+index 7f8b0fc..960d0b9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1146,6 +1146,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1169,6 +1169,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
         WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
         Entity entity = packetplayinuseentity.a((World) worldserver);
--- a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch
@ -1,4 +1,4 @@
-From 39457860e637dd33e23a801f73808afb4f62a496 Mon Sep 17 00:00:00 2001
+From ffef4ba9050f0d22ffae56c417e74fb6194cfa32 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
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2b8a3e5..fe4121f 100644
+index 80123ee..d94ec46 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -481,6 +481,11 @@ public abstract class PlayerList {
+@@ -505,6 +505,11 @@ public abstract class PlayerList {
             Player respawnPlayer = cserver.getPlayer(entityplayer1);
             PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
             cserver.getPluginManager().callEvent(respawnEvent);
--- a/CraftBukkit-Patches/0037-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0037-Player-Collision-API.patch
@ -1,14 +1,14 @@
-From 9ca26db11c543861c8f8faef2e351c353f409284 Mon Sep 17 00:00:00 2001
+From 706e9eb2441d6e10b48de5f7784c421dfd35ce61 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


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7635555..87356e4 100644
+index 60a5e60..ba2e9f9 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -425,6 +425,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
 
             List list = this.world.getEntities(this, axisalignedbb);
 
@ -16,7 +16,7 @@ index 7635555..87356e4 100644
             for (int i = 0; i < list.size(); ++i) {
                 Entity entity = (Entity) list.get(i);
 
-@@ -432,6 +433,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -434,6 +435,7 @@ public abstract class EntityHuman extends EntityLiving {
                     this.d(entity);
                 }
             }
@ -25,7 +25,7 @@ index 7635555..87356e4 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 86474de..6358f5e 100644
+index a58e4eb..e52fa60 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1616,7 +1616,7 @@ public abstract class EntityLiving extends Entity {
@ -38,7 +38,7 @@ index 86474de..6358f5e 100644
                 Entity entity = (Entity) list.get(i);
                 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8d0fc36..d8c8151 100644
+index 4b3e878..b1ce57d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@ -1,14 +1,14 @@
-From c4d1d49d376f4b935dad6b931e196f07ecebec88 Mon Sep 17 00:00:00 2001
+From a4bdded45745aa87c3f5d1a358520da12c011ec8 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 87356e4..d8adce0 100644
+index ba2e9f9..cf1cf37 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -298,6 +298,10 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -300,6 +300,10 @@ public abstract class EntityHuman extends EntityLiving {
                 // Update client
                 if (this instanceof EntityPlayer) {
                     ((EntityPlayer) this).playerConnection.sendPacket(new PacketPlayOutSetSlot((byte) 0, activeContainer.getSlot((IInventory) this.inventory, this.inventory.itemInHandIndex).index, this.g));
--- a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch
@ -1,11 +1,11 @@
-From ed75400b59931091386cd89f497a626717e1f026 Mon Sep 17 00:00:00 2001
+From 75173a882cdd386dc4176a650a62557c642b77fc 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 5e5e6ba..03f6b05 100644
+index 3b69996..8b32d1b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -108,6 +108,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -16,7 +16,7 @@ index 5e5e6ba..03f6b05 100644
 
     public CraftPlayer getPlayer() {
         return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
-@@ -208,6 +209,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -209,6 +210,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             }
             // CraftBukkit start - fire PlayerMoveEvent
             Player player = this.getPlayer();
@ -35,7 +35,7 @@ index 5e5e6ba..03f6b05 100644
             Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
             Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
 
-@@ -236,7 +249,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -237,7 +250,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                 this.lastPitch = to.getPitch();
 
                 // Skip the first time we do this
--- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch
@ -1,4 +1,4 @@
-From 309ed5906bcd6d84e84dc9690f2688c25e692bd4 Mon Sep 17 00:00:00 2001
+From 5e9d6f4af94cb8f5a4e07cd12bec06b96ee6c027 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
@ -119,10 +119,10 @@ index 97920b0..0b86011 100644
         this.d = EnumProtocol.a(packetdataserializer.e());
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c0d1403..65fb97e 100644
+index d94ec46..6357058 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -342,7 +342,7 @@ public abstract class PlayerList {
+@@ -363,7 +363,7 @@ public abstract class PlayerList {
 
         EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), gameprofile, new PlayerInteractManager(server.getWorldServer(0)));
         Player player = entity.getBukkitEntity();
--- a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch
@ -1,14 +1,14 @@
-From 742e8a571717308cbe2687060a0216a32e1f3579 Mon Sep 17 00:00:00 2001
+From e2ba22e4578afa895b8ff0ff3ab7d11cdac6e778 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


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 03f6b05..3cb84aa 100644
+index 80dc5ed..dd731e6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -918,9 +918,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -941,9 +941,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                 this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
             }
 
--- a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch
@ -1,14 +1,14 @@
-From 5658eb456a8edea34220cbd763970a914c49262d Mon Sep 17 00:00:00 2001
+From 691d9ddb1855bd5326e91650e44976d2cdbbdb14 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


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d835cea..7e6c62a 100644
+index dd731e6..b9f6200 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1647,7 +1647,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1670,7 +1670,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
 
             boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
             // CraftBukkit - Add invalidItems check
--- a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@ -1,4 +1,4 @@
-From 75028fdcd5c0f6eb0a6980eb8c595158601f4284 Mon Sep 17 00:00:00 2001
+From 371378e63d7d6dda60ce5226be670d8d25edc3b9 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.
@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7e6c62a..105f38b 100644
+index b9f6200..0acf91a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2004,7 +2004,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -2027,7 +2027,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
     }
 
     // CraftBukkit start - Add "isDisconnected" method
--- a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch
@ -1,11 +1,11 @@
-From 2e797c33e227a3d16e5b0743c02181c01af8ce8f Mon Sep 17 00:00:00 2001
+From 43e9fcaf8f465b0605e878cefa801dfeb59074d1 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!


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d6c8be8..b0a90d7 100644
+index 774fe84..3a68762 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -207,7 +207,7 @@ public abstract class Entity implements ICommandListener {
@ -27,10 +27,10 @@ index d6c8be8..b0a90d7 100644
             f1 = 0;
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d7cd546..ef9e2dd 100644
+index 0acf91a..f3fdd6e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -186,7 +186,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         // CraftBukkit start - Check for NaN
         if (Double.isNaN(packetplayinflying.x) || Double.isNaN(packetplayinflying.y) || Double.isNaN(packetplayinflying.z)) {
             c.warn(player.getName() + " was caught trying to crash the server with an invalid position.");
@ -39,7 +39,7 @@ index d7cd546..ef9e2dd 100644
             return;
         }
         // CraftBukkit end
-@@ -841,7 +841,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -864,7 +864,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             this.player.z();
         } else {
             PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item");
--- a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch
+++ b/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch
@ -1,14 +1,14 @@
-From 3118ca054fa2eaabfb66662704bc60f62950efc7 Mon Sep 17 00:00:00 2001
+From b952ef7806b987f213f930d93015c537379a5276 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 11:14:38 +1000
 Subject: [PATCH] Correct Ban Expiration


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1d3d00f..c9ef1d6 100644
+index 6357058..2d6ddc7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -354,7 +354,7 @@ public abstract class PlayerList {
+@@ -375,7 +375,7 @@ public abstract class PlayerList {
             }
 
             // return s;
--- a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch
+++ b/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch
@ -1,4 +1,4 @@
-From 1e5e5842a6931bb5e35c926906900edd0fc19e91 Mon Sep 17 00:00:00 2001
+From 7606cd78b49a3b5a0e7864a528a06a9f78955c42 Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef9e2dd..ea9cdcc 100644
+index f3fdd6e..7ff587b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -903,7 +903,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -926,7 +926,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             } else if (s.isEmpty()) {
                 c.warn(this.player.getName() + " tried to send an empty message");
             } else if (getPlayer().isConversing()) {
--- a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
@ -1,14 +1,14 @@
-From 58c92688a9ff784173fd881118035ec2d2ba3398 Mon Sep 17 00:00:00 2001
+From 06d434b6ee068029e1ae6ac736ef2956d057c151 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ea9cdcc..a3e4438 100644
+index 7ff587b..6ba95d4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -615,9 +615,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -616,9 +616,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         // CraftBukkit end
     }
 
@ -31,14 +31,18 @@ index ea9cdcc..a3e4438 100644
         
         // CraftBukkit start
         if (this.player.dead) return;
-@@ -641,10 +654,14 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -642,7 +655,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
 
             // CraftBukkit start
             int itemstackAmount = itemstack.count;
+-            
 +            // Spigot start - skip the event if throttled
-+            if (!throttled) {
-             org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack);
-             if (event.useItemInHand() != Event.Result.DENY) {
+            if (!throttled) {            
+             // Raytrace to look for 'rogue armswings'
+             float f1 = this.player.pitch;
+             float f2 = this.player.yaw;
+@@ -668,6 +682,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+             if (event == null || event.useItemInHand() != Event.Result.DENY) {
                 this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack);
             }
 +            }
@ -46,7 +50,7 @@ index ea9cdcc..a3e4438 100644
 
             // CraftBukkit - notch decrements the counter by 1 in the above method with food,
             // snowballs and so forth, but he does it in a place that doesn't cause the
-@@ -670,7 +687,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -693,7 +709,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             }
 
             if (this.checkMovement && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.af().a(blockposition)) {
--- a/CraftBukkit-Patches/0129-Better-item-validation.patch
+++ b/CraftBukkit-Patches/0129-Better-item-validation.patch
@ -1,4 +1,4 @@
-From 79fcb7d55239dec5e6f656769874836fd905f075 Mon Sep 17 00:00:00 2001
+From e4ab8d61ad019d2cfd1021d342d5e367fd8bc51e Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation
@ -102,7 +102,7 @@ index 9a24d2e..d3b5002 100644
 
             addPage(pageArray);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 651f81c..9ab79e3 100644
+index 92a6270..8d754d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -36,6 +36,10 @@ import com.google.common.base.Strings;
@ -116,7 +116,7 @@ index 651f81c..9ab79e3 100644
 /**
  * Children must include the following:
  *
-@@ -228,7 +232,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -229,7 +233,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
             NBTTagCompound display = tag.getCompound(DISPLAY.NBT);
 
             if (display.hasKey(NAME.NBT)) {
@ -125,7 +125,7 @@ index 651f81c..9ab79e3 100644
             }
 
             if (display.hasKey(LORE.NBT)) {
-@@ -236,7 +240,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -237,7 +241,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
                 lore = new ArrayList<String>(list.size());
 
                 for (int index = 0; index < list.size(); index++) {
--- a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch
@ -1,14 +1,14 @@
-From 404e7af8294bcfa7a3267133c0c0e9708713f63e Mon Sep 17 00:00:00 2001
+From 3295048f09613aac6d7cafe007e8304c2271afe7 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a3e4438..3246c0f 100644
+index b266f6a..73477ee 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -405,7 +405,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -406,7 +406,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                 d17 = d11 * d11 + d12 * d12 + d13 * d13;
                 boolean flag1 = false;
 
--- a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch
@ -1,14 +1,14 @@
-From 128a4b57c967c09c499e381fbbe9578cd782ccaf Mon Sep 17 00:00:00 2001
+From 453d7cec49ec898286b82e4d4467ffb8d733bea8 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3246c0f..9240aab 100644
+index 73477ee..abcb3cd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -378,7 +378,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -379,7 +379,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                 // CraftBukkit end
                 double d17 = d14 * d14 + d15 * d15 + d16 * d16;
 
--- a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch
+++ b/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch
@ -1,4 +1,4 @@
-From 5101f8f8ab70eca352b0e785443daa64aab9d876 Mon Sep 17 00:00:00 2001
+From 57950764560d04e70e8388db6d6accf8a8de0b05 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 31 Jul 2014 17:48:20 +0100
 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go
@ -6,7 +6,7 @@ Subject: [PATCH] Filter attribute modifiers which cause the attribute to go


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9ab79e3..aaf56bf 100644
+index 8d754d8..7638832 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -38,6 +38,8 @@ import com.google.common.collect.ImmutableMap;
@ -18,7 +18,7 @@ index 9ab79e3..aaf56bf 100644
 // Spigot end
 
 /**
-@@ -257,6 +259,123 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -258,6 +260,123 @@ class CraftMetaItem implements ItemMeta, Repairable {
             NBTTagList save = null;
             NBTTagList nbttaglist = tag.getList(ATTRIBUTES.NBT, 10);
 
@ -48,11 +48,11 @@ index 9ab79e3..aaf56bf 100644
 +                NBTTagCompound nbttagcompound = oldList.get( i );
 +                if ( nbttagcompound == null ) continue;
 +
-+                if ( !( nbttagcompound.get( ATTRIBUTES_UUID_HIGH.NBT ) instanceof NBTTagLong ) )
+                if ( !nbttagcompound.hasKeyOfType(ATTRIBUTES_UUID_HIGH.NBT, 99) )
 +                {
 +                    continue;
 +                }
-+                if ( !( nbttagcompound.get( ATTRIBUTES_UUID_LOW.NBT ) instanceof NBTTagLong ) )
+                if ( !nbttagcompound.hasKeyOfType(ATTRIBUTES_UUID_LOW.NBT, 99)  )
 +                {
 +                    continue;
 +                }
@ -64,11 +64,11 @@ index 9ab79e3..aaf56bf 100644
 +                {
 +                    continue;
 +                }
-+                if ( !( nbttagcompound.get( ATTRIBUTES_VALUE.NBT ) instanceof NBTTagDouble ) )
+                if ( !nbttagcompound.hasKeyOfType(ATTRIBUTES_VALUE.NBT, 99) )
 +                {
 +                    continue;
 +                }
-+                if ( !( nbttagcompound.get( ATTRIBUTES_TYPE.NBT ) instanceof NBTTagInt ) || nbttagcompound.getInt( ATTRIBUTES_TYPE.NBT ) < 0 || nbttagcompound.getInt( ATTRIBUTES_TYPE.NBT ) > 2 )
+                if ( !nbttagcompound.hasKeyOfType(ATTRIBUTES_TYPE.NBT, 99) || nbttagcompound.getInt( ATTRIBUTES_TYPE.NBT ) < 0 || nbttagcompound.getInt( ATTRIBUTES_TYPE.NBT ) > 2 )
 +                {
 +                    continue;
 +                }
--- a/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch
+++ b/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch
@ -1,22 +0,0 @@
-From f2d2e7209a344324646541fd5fa8c3cee7c02295 Mon Sep 17 00:00:00 2001
-From: Thinkofdeath <thinkofdeath@spigotmc.org>
-Date: Thu, 7 Aug 2014 15:48:33 +0100
-Subject: [PATCH] Fix LEFT_CLICK_AIR detection when not in creative
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9240aab..b7bb153 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1113,7 +1113,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
-         float f6 = MathHelper.sin(-f1 * 0.017453292F);
-         float f7 = f4 * f5;
-         float f8 = f3 * f5;
-        double d3 = 5.0D;
-+        double d3 = player.playerInteractManager.getGameMode() == EnumGamemode.CREATIVE ? 5.0D : 4.5D; // Spigot
-         Vec3D vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
-         MovingObjectPosition movingobjectposition = this.player.world.rayTrace(vec3d, vec3d1, false);
- 
-- 
-2.1.0
-
--- a/CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch
@ -1,4 +1,4 @@
-From 1523633c4c42ce05c340947348f123726ad5dac7 Mon Sep 17 00:00:00 2001
+From c938d89461ea977f4787b37f17c1bc774005b0a6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 8 Aug 2014 19:57:03 +1000
 Subject: [PATCH] Plug WorldMap Memory Leak
@ -25,7 +25,7 @@ index 6bae818..a4e5294 100644
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index eb5b1db..762e469 100644
+index 76340f6..b6221c6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1081,6 +1081,23 @@ public abstract class World implements IBlockAccess {
--- a/CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch
+++ b/CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch
@ -1,4 +1,4 @@
-From faf1fecf4579035703abc6b0b7f29c6e0ea013e8 Mon Sep 17 00:00:00 2001
+From 8a76d65baf9d9591f24ebf008f8e1d96d52ba63b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Aug 2014 00:56:41 -0400
 Subject: [PATCH] Fix Corrupted Trapped Chest
@ -9,7 +9,7 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever
 This will now fix Trapped Chests too.

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9012c9e..508e4ce 100644
+index b5627c5..8b4278f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -114,7 +114,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
--- a/CraftBukkit-Patches/0150-Remove-uneeded-validation.patch
+++ b/CraftBukkit-Patches/0150-Remove-uneeded-validation.patch
@ -1,14 +1,14 @@
-From 57b0eac9f25991ca4dc7112f5b831c2da86614c0 Mon Sep 17 00:00:00 2001
+From 142f4098cd2b3118351593dfe155cdfa771a0749 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Fri, 15 Aug 2014 18:11:09 -0400
 Subject: [PATCH] Remove uneeded validation


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index aaf56bf..7f3339c 100644
+index 7638832..e134ace 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -510,7 +510,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -511,7 +511,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
     }
 
     static void applyEnchantments(Map<Enchantment, Integer> enchantments, NBTTagCompound tag, ItemMetaKey key) {
@ -17,7 +17,7 @@ index aaf56bf..7f3339c 100644
             return;
         }
 
-@@ -601,7 +601,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -602,7 +602,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
     }
 
     public boolean removeEnchant(Enchantment ench) {
--- a/CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch
+++ b/CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch
@ -1,14 +1,14 @@
-From 743077c7a5cd59c8091cc51947722f3ec1b15881 Mon Sep 17 00:00:00 2001
+From 1372f29a869fc690cf3f386b6e9dc09532200ddd Mon Sep 17 00:00:00 2001
 From: lazertester <austin.techhead@gmail.com>
 Date: Sun, 17 Aug 2014 19:56:17 +1000
 Subject: [PATCH] Add Hunger Config Values


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d8adce0..d96bf18 100644
+index cf1cf37..4ccd4d5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1066,7 +1066,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1085,7 +1085,7 @@ public abstract class EntityHuman extends EntityLiving {
                             }
                         }
 
@ -17,7 +17,7 @@ index d8adce0..d96bf18 100644
                     } else if (flag1) {
                         entity.extinguish();
                     }
-@@ -1313,9 +1313,9 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1332,9 +1332,9 @@ public abstract class EntityHuman extends EntityLiving {
         super.bE();
         this.b(StatisticList.u);
         if (this.isSprinting()) {
--- a/CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch
+++ b/CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch
@ -1,4 +1,4 @@
-From 6a6951118b665867bf2f7328137c22199e5ef7be Mon Sep 17 00:00:00 2001
+From 870475a482fbfbd4ca771d3be85630cff5427d59 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sun, 17 Aug 2014 12:42:53 +0200
 Subject: [PATCH] Make debug logging togglable.
--- a/CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch
+++ b/CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch
@ -1,4 +1,4 @@
-From 3afef16f899a9de931737b9b7f712357fcf6f947 Mon Sep 17 00:00:00 2001
+From 36429dd025bd601b1b681fb79409e8795316c3c8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Tue, 19 Aug 2014 11:04:21 +0100
 Subject: [PATCH] Skip invalid enchants in CraftMetaItem
@ -8,10 +8,10 @@ CraftMetaItem would add a null enchantment into the enchantment map which causes
 NullPointers later

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 7f3339c..9db1c14 100644
+index e134ace..e8c1a99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -433,7 +433,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -434,7 +434,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
             int id = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_ID.NBT);
             int level = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_LVL.NBT);
 
--- a/CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch
+++ b/CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch
@ -1,4 +1,4 @@
-From 39f6dc45ba2b718f82c064cf4dd344c0e7155cfa Mon Sep 17 00:00:00 2001
+From ff0f3082ea5c282ddcaa8411a95b5e4d4e813154 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Aug 2014 18:12:32 -0400
 Subject: [PATCH] Limit TNT Detonations per tick
@ -19,7 +19,7 @@ index 98c8d26..3621faf 100644
         this.lastY = this.locY;
         this.lastZ = this.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 508e4ce..ff9ac1b 100644
+index 8b4278f..c6e8321 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -575,6 +575,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
--- a/CraftBukkit-Patches/0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/CraftBukkit-Patches/0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@ -1,14 +1,14 @@
-From dbd41a3b6050781403b9f53c6dbcc2c02d4d21d8 Mon Sep 17 00:00:00 2001
+From 254472845abd1ee3a69b4282b547262ff9d1d474 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:35:16 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9db1c14..0b4776e 100644
+index e8c1a99..96b7a07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -202,6 +202,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -203,6 +203,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
     static final ItemMetaKey ATTRIBUTES_UUID_HIGH = new ItemMetaKey("UUIDMost");
     @Specific(Specific.To.NBT)
     static final ItemMetaKey ATTRIBUTES_UUID_LOW = new ItemMetaKey("UUIDLeast");
@ -16,7 +16,7 @@ index 9db1c14..0b4776e 100644
 
     private String displayName;
     private List<String> lore;
-@@ -227,6 +228,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -228,6 +229,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
 
         this.repairCost = meta.repairCost;
         this.attributes = meta.attributes;
@ -24,7 +24,7 @@ index 9db1c14..0b4776e 100644
     }
 
     CraftMetaItem(NBTTagCompound tag) {
-@@ -419,6 +421,12 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -420,6 +422,12 @@ class CraftMetaItem implements ItemMeta, Repairable {
         } else {
             attributes = null;
         }
@ -37,7 +37,7 @@ index 9db1c14..0b4776e 100644
     }
 
     static Map<Enchantment, Integer> buildEnchantments(NBTTagCompound tag, ItemMetaKey key) {
-@@ -459,6 +467,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -460,6 +468,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
         }
 
         attributes = null;
@ -51,7 +51,7 @@ index 9db1c14..0b4776e 100644
     }
 
     static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
-@@ -491,6 +506,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -492,6 +507,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
 
         applyEnchantments(enchantments, itemTag, ENCHANTMENTS);
 
@ -65,7 +65,7 @@ index 9db1c14..0b4776e 100644
         if (hasRepairCost()) {
             itemTag.setInt(REPAIR.NBT, repairCost);
         }
-@@ -549,7 +571,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -550,7 +572,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
 
     @Overridden
     boolean isEmpty() {
@ -74,7 +74,7 @@ index 9db1c14..0b4776e 100644
     }
 
     public String getDisplayName() {
-@@ -673,7 +695,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -674,7 +696,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
                 && (this.hasEnchants() ? that.hasEnchants() && this.enchantments.equals(that.enchantments) : !that.hasEnchants())
                 && (this.hasLore() ? that.hasLore() && this.lore.equals(that.lore) : !that.hasLore())
                 && (this.hasAttributes() ? that.hasAttributes() && this.attributes.equals(that.attributes) : !that.hasAttributes())
@ -83,7 +83,7 @@ index 9db1c14..0b4776e 100644
     }
 
     /**
-@@ -699,6 +721,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -700,6 +722,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
         hash = 61 * hash + (hasEnchants() ? this.enchantments.hashCode() : 0);
         hash = 61 * hash + (hasAttributes() ? this.attributes.hashCode() : 0);
         hash = 61 * hash + (hasRepairCost() ? this.repairCost : 0);
@ -91,7 +91,7 @@ index 9db1c14..0b4776e 100644
         return hash;
     }
 
-@@ -742,6 +765,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -743,6 +766,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
             builder.put(REPAIR.BUKKIT, repairCost);
         }
 
@ -105,7 +105,7 @@ index 9db1c14..0b4776e 100644
         return builder;
     }
 
-@@ -804,6 +834,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -805,6 +835,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
     // Spigot start
     private final Spigot spigot = new Spigot()
     {
--- a/CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch
+++ b/CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch
@ -1,4 +1,4 @@
-From 4d6ea8da056e4930014d6e1b911c7d95c46df555 Mon Sep 17 00:00:00 2001
+From a3fc80cb344d91515b2f514b689063f83721b43b Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Sat, 9 Aug 2014 13:56:51 -0400
 Subject: [PATCH] Configurable Hanging Tick
--- a/CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch
+++ b/CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch
@ -1,4 +1,4 @@
-From 2db6b2e406a40c42ffb7b2576f4bd8a5ba657123 Mon Sep 17 00:00:00 2001
+From a83fd0eb5340c61459f0b70103cd0576375a182e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 21 Sep 2014 10:06:01 +1000
 Subject: [PATCH] Fix Some Memory Leaks
--- a/CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch
+++ b/CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch
@ -1,4 +1,4 @@
-From bf8115d31c7481e0fb165da6bfdbe505a4b5649e Mon Sep 17 00:00:00 2001
+From 93d8b11854923443d2d26adbf395e5ade019c98c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 30 Sep 2014 21:43:15 +1000
 Subject: [PATCH] Refactor ItemDoor Place
--- a/CraftBukkit-Patches/0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch
+++ b/CraftBukkit-Patches/0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch
@ -1,4 +1,4 @@
-From 5d60ed66bf42fc6932aaba1812a3f43242a886b4 Mon Sep 17 00:00:00 2001
+From 1cb3de476b6b443341ad6e39987df680888a55fc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 30 Sep 2014 21:49:10 +1000
 Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required