diff --git a/Bukkit b/Bukkit
index 30a9411199..13add0250e 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 30a9411199af1fddf0e26c2181fa8f37b980a128
+Subproject commit 13add0250e0d262c48206a5c2bc4c2fcb30c9f21
diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch
index 3e3c012b24..615be41de8 100644
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 4563fe77bd20047b474f591af71f2f91ccd9b2b3 Mon Sep 17 00:00:00 2001
+From 592fb8e4709be193461d8dc93920bf3fc072f1af 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 4209f2a..37ef0ef 100644
+index dfdcbdf..2d1df20 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index 4209f2a..37ef0ef 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.6.2-R1.1-SNAPSHOT</version>
+     <version>1.6.4-R0.1-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>
diff --git a/CraftBukkit b/CraftBukkit
index 22f47a805a..317b76b3f6 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 22f47a805a23edd6aa202aa78a85149bf1dfcc99
+Subproject commit 317b76b3f614d9ea8e1b93b86e9a53ceefd00804
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index db839f0561..f07b15eec4 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 798b905a01eca318b3579cd5127edc42cce24c26 Mon Sep 17 00:00:00 2001
+From 0acc49565a770628bc80bc7c615d82f2d2c8ccd0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index f23621d..825c821 100644
+index 7c23af9..c155913 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index f23621d..825c821 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.6.2-R1.1-SNAPSHOT</version>
+   <version>1.6.4-R0.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -34,7 +34,7 @@ index f23621d..825c821 100644
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 @@ -16,25 +24,6 @@
-     <minecraft_version>1_6_R2</minecraft_version>
+     <minecraft_version>1_6_R3</minecraft_version>
    </properties>
  
 -  <scm>
diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch
index a5a0476ec1..62ff665042 100644
--- a/CraftBukkit-Patches/0002-mc-dev-imports.patch
+++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch
@@ -1,4 +1,4 @@
-From e15463f906861778a9a2c9a62155c6f226330b10 Mon Sep 17 00:00:00 2001
+From fa744ba52455d9b4bd030e6b23d6cf4fb294621a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:13:29 +1000
 Subject: [PATCH] mc-dev imports
@@ -6,7 +6,7 @@ Subject: [PATCH] mc-dev imports
 
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
 new file mode 100644
-index 0000000..d336901
+index 0000000..9acd4f2
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -0,0 +1,80 @@
@@ -65,10 +65,10 @@ index 0000000..d336901
 +    }
 +
 +    public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman, int l, float f, float f1, float f2) {
-+        if (entityhuman.bx() != null && entityhuman.bx().id == Item.FLINT_AND_STEEL.id) {
++        if (entityhuman.by() != null && entityhuman.by().id == Item.FLINT_AND_STEEL.id) {
 +            this.a(world, i, j, k, 1, entityhuman);
 +            world.setAir(i, j, k);
-+            entityhuman.bx().damage(1, entityhuman);
++            entityhuman.by().damage(1, entityhuman);
 +            return true;
 +        } else {
 +            return super.interact(world, i, j, k, entityhuman, l, f, f1, f2);
diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index a3172c02ed..66b7961479 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From b2fceb79c1539564a17de3eb86d2fb7be3f3c385 Mon Sep 17 00:00:00 2001
+From 671c8e6f49c82a03125fb9983a3d1df081f6ccd7 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
@@ -64,12 +64,12 @@ index d9659fb..4f4b84f 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5d43c9..3cf0c28 100644
+index ac73273..63ce45a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1072,4 +1072,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
-         collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
+         collection.add(new AttributeModifiable(getHandle().aX(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
      }
 +
 +    // Spigot start
diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch
index 0c0c28dbc2..2a31be8ad4 100644
--- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch
+++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch
@@ -1,14 +1,14 @@
-From 12a4f7540086aa7e67d953bdc5a18cfed30414f7 Mon Sep 17 00:00:00 2001
+From 8f375266d3bae960a7dca5ca52ac9d40d044239f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 95d7e5d..6fe33d0 100644
+index f871b73..0cca057 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -89,6 +89,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -90,6 +90,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          if (this.I() < 0) {
              this.setPort(this.propertyManager.getInt("server-port", 25565));
          }
@@ -20,7 +20,7 @@ index 95d7e5d..6fe33d0 100644
  
          this.getLogger().info("Generating keypair");
          this.a(MinecraftEncryption.b());
-@@ -103,7 +108,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -104,7 +109,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
  
@@ -34,7 +34,7 @@ index 95d7e5d..6fe33d0 100644
          if (!this.getOnlineMode()) {
              this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0435ca7..7d4def3 100644
+index 3924a5c..fbbfa33 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -99,6 +99,7 @@ public abstract class World implements IBlockAccess {
@@ -54,7 +54,7 @@ index 0435ca7..7d4def3 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4e74760..44af717 100644
+index d9396f1..acd5b42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -214,8 +214,10 @@ public final class CraftServer implements Server {
diff --git a/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch
index 8bc2cba3b5..cec6566d2b 100644
--- a/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch
@@ -1,14 +1,14 @@
-From b51ae5df5a86c36e57460ed23da469e615fa943e Mon Sep 17 00:00:00 2001
+From 608e4269f7d6eaa3db5509d6c696185e35a351e9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 12:28:17 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 26cfa0c..f025083 100644
+index 029131d..d3a4265 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -86,6 +86,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -87,6 +87,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      // CraftBukkit end
@@ -21,21 +21,21 @@ index 26cfa0c..f025083 100644
  
      public MinecraftServer(OptionSet options) { // CraftBukkit - signature file -> OptionSet
          this.c = Proxy.NO_PROXY;
-@@ -389,39 +395,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -391,39 +397,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      public void run() {
          try {
              if (this.init()) {
 -                long i = aq();
 -
--                for (long j = 0L; this.isRunning; this.Q = true) {
+-                for (long j = 0L; this.isRunning; this.R = true) {
 -                    long k = aq();
 -                    long l = k - i;
 -
--                    if (l > 2000L && i - this.R >= 15000L) {
+-                    if (l > 2000L && i - this.S >= 15000L) {
 -                        if (this.server.getWarnOnOverload()) // CraftBukkit - Added option to suppress warning messages
 -                        this.getLogger().warning("Can\'t keep up! Did the system time change, or is the server overloaded?");
 -                        l = 2000L;
--                        this.R = i;
+-                        this.S = i;
 -                    }
 -
 -                    if (l < 0L) {
@@ -49,7 +49,7 @@ index 26cfa0c..f025083 100644
 -                        this.s();
 -                        j = 0L;
 +                // Spigot start
-+                for (long lastTick = 0L; this.isRunning; this.Q = true) {
++                for (long lastTick = 0L; this.isRunning; this.R = true) {
 +                    long curTime = System.nanoTime();
 +                    long wait = TICK_TIME - (curTime - lastTick) - catchupTime;
 +                    if (wait > 0) {
@@ -117,7 +117,7 @@ index 0000000..f114a31
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 83696e9..f97a80b 100644
+index 8f42042..693518d 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;
diff --git a/CraftBukkit-Patches/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
index 9d54cc04ad..28cd1c7574 100644
--- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From aedca23e7d617be31e381f058f6bd33ddfaad927 Mon Sep 17 00:00:00 2001
+From 85337aff36373256de0d97501f509d6d83642d83 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@@ -26,7 +26,7 @@ index b73f69c..17934c0 100644
  
          // CraftBukkit start - If we didn't need to load the chunk run the callback now
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 50edbdb..76d9998 100644
+index 2158088..d65c123 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@@ -61,9 +61,9 @@ index 50edbdb..76d9998 100644
 +        org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.stopTiming(); // Spigot
      }
  
-     protected void C() {
+     protected void D() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f025083..f52d619 100644
+index 830abcd..fba219f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -7,7 +7,6 @@ import java.security.KeyPair;
@@ -82,7 +82,7 @@ index f025083..f52d619 100644
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
  import org.bukkit.event.world.WorldSaveEvent;
-@@ -409,7 +409,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -411,7 +411,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
                      currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
                      lastTick = curTime;
                      MinecraftServer.currentTick++;
@@ -93,7 +93,7 @@ index f025083..f52d619 100644
                  }
                  // Spigot end
              } else {
-@@ -508,6 +511,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -510,6 +513,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      public void t() {
          this.methodProfiler.a("levels");
  
@@ -101,7 +101,7 @@ index f025083..f52d619 100644
          // CraftBukkit start
          this.server.getScheduler().mainThreadHeartbeat(this.ticks);
  
-@@ -516,7 +520,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -518,7 +522,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
              processQueue.remove().run();
          }
  
@@ -112,7 +112,7 @@ index f025083..f52d619 100644
  
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.ticks % 20 == 0) {
-@@ -568,7 +575,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -570,7 +577,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
  
                  this.methodProfiler.b();
                  this.methodProfiler.a("tracker");
@@ -122,7 +122,7 @@ index f025083..f52d619 100644
                  this.methodProfiler.b();
                  this.methodProfiler.b();
              // } // CraftBukkit
-@@ -577,14 +586,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -579,14 +588,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
          }
  
          this.methodProfiler.c("connection");
@@ -144,10 +144,10 @@ index f025083..f52d619 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 6444a2f..4c900a6 100644
+index a5d7500..ad65a6a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -939,6 +939,7 @@ public class PlayerConnection extends Connection {
+@@ -944,6 +944,7 @@ public class PlayerConnection extends Connection {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -155,7 +155,7 @@ index 6444a2f..4c900a6 100644
          // CraftBukkit start
          CraftPlayer player = this.getPlayer();
  
-@@ -946,19 +947,23 @@ public class PlayerConnection extends Connection {
+@@ -951,19 +952,23 @@ public class PlayerConnection extends Connection {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -197,7 +197,7 @@ index f4be980..6ae7cb3 100644
      private static Map b = new HashMap();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d5552b6..9da3f13 100644
+index ebbda63..3143d6e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -299,7 +299,7 @@ index d5552b6..9da3f13 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1a34feb..db0345d 100644
+index bff9c6a..c1239f1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -179,9 +179,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
diff --git a/CraftBukkit-Patches/0023-Watchdog-Thread.patch b/CraftBukkit-Patches/0023-Watchdog-Thread.patch
index a6d4dba80b..17d6b21e6c 100644
--- a/CraftBukkit-Patches/0023-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0023-Watchdog-Thread.patch
@@ -1,14 +1,14 @@
-From de7e8217654cf0fd14076c0ce8cbf569cc84e39d Mon Sep 17 00:00:00 2001
+From 3cd709b7763070249f9d6c8c7c805a227de91696 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f52d619..33eaecc 100644
+index fba219f..e5b8391 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -413,6 +413,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -415,6 +415,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
                      this.s();
                      SpigotTimings.serverTickTimer.stopTiming();
                      org.spigotmc.CustomTimingsHandler.tick();
@@ -16,7 +16,7 @@ index f52d619..33eaecc 100644
                  }
                  // Spigot end
              } else {
-@@ -440,6 +441,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -442,6 +443,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
              this.a(crashreport);
          } finally {
              try {
diff --git a/CraftBukkit-Patches/0024-Netty.patch b/CraftBukkit-Patches/0024-Netty.patch
index e6e348935f..9b2a4babe3 100644
--- a/CraftBukkit-Patches/0024-Netty.patch
+++ b/CraftBukkit-Patches/0024-Netty.patch
@@ -1,11 +1,11 @@
-From edc58f74c709f3ad2c2a8ec96dcb518aa5e6a3fd Mon Sep 17 00:00:00 2001
+From 45291669fd55e2a6d13274ec194ba9d7454385f3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:06:29 +1000
 Subject: [PATCH] Netty
 
 
 diff --git a/pom.xml b/pom.xml
-index ac0d198..db54e95 100644
+index c155913..3ca28d6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -112,6 +112,21 @@
@@ -31,10 +31,10 @@ index ac0d198..db54e95 100644
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 6fe33d0..fa02974 100644
+index 0cca057..4759f6a 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -100,7 +100,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -101,7 +101,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.I());
  
          try {
@@ -100,7 +100,7 @@ index a2bdfa3..fd6acab 100644
 +    public void setSocketAddress(SocketAddress address) { k = address; } // Spigot
  }
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index 1749059..7f2c1a9 100644
+index 1bb77a9..f48d4a9 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
 @@ -16,7 +16,7 @@ public class PendingConnection extends Connection {
@@ -129,7 +129,7 @@ index 1749059..7f2c1a9 100644
      }
  
      // CraftBukkit start
-@@ -149,7 +154,7 @@ public class PendingConnection extends Connection {
+@@ -147,7 +152,7 @@ public class PendingConnection extends Connection {
              String s = null;
              // CraftBukkit
              org.bukkit.event.server.ServerListPingEvent pingEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(this.server.server, getSocket().getInetAddress(), this.server.getMotd(), playerlist.getPlayerCount(), playerlist.getMaxPlayers());
@@ -138,7 +138,7 @@ index 1749059..7f2c1a9 100644
                  // CraftBukkit
                  s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
              } else {
-@@ -178,9 +183,18 @@ public class PendingConnection extends Connection {
+@@ -176,9 +181,18 @@ public class PendingConnection extends Connection {
  
              this.networkManager.queue(new Packet255KickDisconnect(s));
              this.networkManager.d();
diff --git a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
index fa2224a795..f1d8130448 100644
--- a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
@@ -1,11 +1,11 @@
-From 4c20b9d01de06bcba204c1e68910e9265ea8aedb Mon Sep 17 00:00:00 2001
+From b9aa8fd32c77972fef5c23f0bae3cee24e821e2c 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 41ba8fe..e2011ea 100644
+index 69f81ca..f3a6027 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -178,7 +178,13 @@ public final class ItemStack {
@@ -44,8 +44,8 @@ index 41ba8fe..e2011ea 100644
      public void damage(int i, EntityLiving entityliving) {
          if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
              if (this.g()) {
--                if (this.isDamaged(i, entityliving.aC())) {
-+                if (this.isDamaged(i, entityliving.aC(), entityliving)) {
+-                if (this.isDamaged(i, entityliving.aD())) {
++                if (this.isDamaged(i, entityliving.aD(), entityliving)) {
                      entityliving.a(this);
                      --this.count;
                      if (entityliving instanceof EntityHuman) {
diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
index 724dd898bb..8a73ba4cac 100644
--- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From ba5620ccf386fd94ddce7fe2158550ece485f03a Mon Sep 17 00:00:00 2001
+From a00b57c3f0b5e97e36616d767febdcb7011a064f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
 - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index 7f2c1a9..5593b62 100644
+index f48d4a9..9080831 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -237,4 +237,17 @@ public class PendingConnection extends Connection {
+@@ -235,4 +235,17 @@ public class PendingConnection extends Connection {
      static boolean a(PendingConnection pendingconnection, boolean flag) {
          return pendingconnection.h = flag;
      }
@@ -59,7 +59,7 @@ index f87ebf9..f5032be 100644
                      event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 988c6e7..aa49c6c 100644
+index 20be022..e242f7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1077,6 +1077,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
index 7a3f565e75..783f4b9adf 100644
--- a/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
@@ -1,14 +1,14 @@
-From c46ce6480300baa0776e9783f66f5dfdd027cadf Mon Sep 17 00:00:00 2001
+From 28a5c1180a8392cb0c4b5686cee3e605311beb35 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 58e5217..f9ac1e1 100644
+index 2e234f1..d054efe 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -52,6 +52,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -54,6 +54,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int newTotalExp = 0;
      public boolean keepLevel = false;
      public double maxHealthCache;
diff --git a/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch b/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
index 863a12dba8..df8c90b626 100644
--- a/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
+++ b/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
@@ -1,30 +1,28 @@
-From 528a10480647a939af1c9271765c34f2eaa33c8d Mon Sep 17 00:00:00 2001
+From 1df832542a0945bd61df1795a36fb891a537d31c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 25 Jul 2013 17:06:02 +1000
 Subject: [PATCH] Filter Invalid Names
 
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index 5593b62..5e9dad2 100644
+index 9080831..3be39d7 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -66,6 +66,7 @@ public class PendingConnection extends Connection {
+@@ -66,12 +66,13 @@ public class PendingConnection extends Connection {
          }
      }
  
 +    private static final java.util.regex.Pattern validName = java.util.regex.Pattern.compile("^[a-zA-Z0-9_-]{2,16}$"); // Spigot
      public void a(Packet2Handshake packet2handshake) {
-         // CraftBukkit start
          if (this.g != null) {
-@@ -74,7 +75,7 @@ public class PendingConnection extends Connection {
-         this.hostname = packet2handshake.c == null ? "" : packet2handshake.c + ':' + packet2handshake.d;
-         // CraftBukkit end
-         this.g = packet2handshake.f();
--        if (!this.g.equals(StripColor.a(this.g))) {
-+        if (!this.g.equals(StripColor.a(this.g)) || !validName.matcher( this.g ).matches() ) { // Spigot
-             this.disconnect("Invalid username!");
+             this.disconnect("Quit repeating yourself!");
          } else {
-             PublicKey publickey = this.server.H().getPublic();
+             this.g = packet2handshake.f();
+-            if (!this.g.equals(StripColor.a(this.g))) {
++            if (!this.g.equals(StripColor.a(this.g)) || !validName.matcher( this.g ).matches() ) { // Spigot
+                 this.disconnect("Invalid username!");
+             } else {
+                 PublicKey publickey = this.server.H().getPublic();
 -- 
 1.8.1.2
 
diff --git a/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch b/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
index cf9dbc0b89..163bedc6b6 100644
--- a/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
+++ b/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
@@ -1,14 +1,14 @@
-From 71aaa40b9d6f728e56c230678bedcba3e04f3a5e Mon Sep 17 00:00:00 2001
+From 7397a685fe0b5034c6d10f2759092803aeed0443 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:53:03 +1000
 Subject: [PATCH] Enable Foreign Language Signs
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c900a6..7528703 100644
+index ad65a6a..3437f98 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1565,7 +1565,7 @@ public class PlayerConnection extends Connection {
+@@ -1577,7 +1577,7 @@ public class PlayerConnection extends Connection {
                      flag = false;
                  } else {
                      for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
diff --git a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
index 17f1a5bf8e..2faeb8d650 100644
--- a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
@@ -1,14 +1,14 @@
-From 4ba95ced5c175bebc9ac8f1e0bb143473e5fcb66 Mon Sep 17 00:00:00 2001
+From 6d6b2f23bb555609d07998469e3c6b3c85b8c463 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:59:22 +1000
 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 7528703..f894e24 100644
+index 3437f98..fd6995d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -829,7 +829,17 @@ public class PlayerConnection extends Connection {
+@@ -834,7 +834,17 @@ public class PlayerConnection extends Connection {
                  this.chat(s, packet3chat.a_());
  
                  // This section stays because it is only applicable to packets
diff --git a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
index bbff77548b..84bee5557a 100644
--- a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
@@ -1,14 +1,14 @@
-From 03a26bff7fe3efbb77258b3aa092bfc079ac1108 Mon Sep 17 00:00:00 2001
+From 7c64c6398ff05841f10215cdf719539dd258d358 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 f894e24..27776e4 100644
+index fd6995d..3c03d5a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -962,7 +962,12 @@ public class PlayerConnection extends Connection {
+@@ -967,7 +967,12 @@ public class PlayerConnection extends Connection {
          }
  
          try {
diff --git a/CraftBukkit-Patches/0049-Configurable-Messages.patch b/CraftBukkit-Patches/0049-Configurable-Messages.patch
index d01ac9c995..6f3c6a48e7 100644
--- a/CraftBukkit-Patches/0049-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0049-Configurable-Messages.patch
@@ -1,25 +1,25 @@
-From bd3a9ccfa048c4e5f99c2add256cdca7789a5a07 Mon Sep 17 00:00:00 2001
+From 4663f1e6e86fdf04862f8a470e2bed8b3382d672 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index 5e9dad2..9deb9d1 100644
+index 3be39d7..a30717a 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -82,9 +82,9 @@ public class PendingConnection extends Connection {
+@@ -79,9 +79,9 @@ public class PendingConnection extends Connection {
  
-             if (packet2handshake.d() != 74) {
-                 if (packet2handshake.d() > 74) {
--                    this.disconnect("Outdated server!");
-+                    this.disconnect(org.spigotmc.SpigotConfig.outdatedServerMessage); // Spigot
+                 if (packet2handshake.d() != 78) {
+                     if (packet2handshake.d() > 78) {
+-                        this.disconnect("Outdated server!");
++                        this.disconnect(org.spigotmc.SpigotConfig.outdatedServerMessage); // Spigot
+                     } else {
+-                        this.disconnect("Outdated client!");
++                        this.disconnect(org.spigotmc.SpigotConfig.outdatedClientMessage); // Spigot
+                     }
                  } else {
--                    this.disconnect("Outdated client!");
-+                    this.disconnect(org.spigotmc.SpigotConfig.outdatedClientMessage); // Spigot
-                 }
-             } else {
-                 this.loginKey = this.server.getOnlineMode() ? Long.toString(random.nextLong(), 16) : "-";
+                     this.loginKey = this.server.getOnlineMode() ? Long.toString(random.nextLong(), 16) : "-";
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
 index a85157b..e5a259d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
diff --git a/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch b/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
index 82be0c0c2a..3d5a4f94d2 100644
--- a/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
+++ b/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
@@ -1,14 +1,14 @@
-From d0d33c2a76ff2f3296819e8285c903de0c5f3904 Mon Sep 17 00:00:00 2001
+From d964dd9ec685eddd8bda68260b57ef12d2c2b1be Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 25 Jun 2013 18:09:26 +1000
 Subject: [PATCH] Always Fire PreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index 9deb9d1..a5c3104 100644
+index a30717a..b098745 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -114,7 +114,7 @@ public class PendingConnection extends Connection {
+@@ -112,7 +112,7 @@ public class PendingConnection extends Connection {
              }
  
              this.j = true;
diff --git a/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
index f06e7d97b6..6d7db9a143 100644
--- a/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
@@ -1,14 +1,14 @@
-From 3022a362614f2ff5bd8e54ac4db7be1a8d807992 Mon Sep 17 00:00:00 2001
+From 8d414631b4347cfcf8ac81810462f80147f1a8d2 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 27776e4..1673f2f 100644
+index 3c03d5a..10d853b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1080,6 +1080,13 @@ public class PlayerConnection extends Connection {
+@@ -1087,6 +1087,13 @@ public class PlayerConnection extends Connection {
  
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = worldserver.getEntity(packet7useentity.target);
@@ -20,8 +20,8 @@ index 27776e4..1673f2f 100644
 +        }
 +        // Spigot End
  
+         this.player.u();
          if (entity != null) {
-             boolean flag = this.player.o(entity);
 -- 
 1.8.1.2
 
diff --git a/CraftBukkit-Patches/0058-Colour-Console-Messages.patch b/CraftBukkit-Patches/0058-Colour-Console-Messages.patch
index 99e949d74e..af66198cdd 100644
--- a/CraftBukkit-Patches/0058-Colour-Console-Messages.patch
+++ b/CraftBukkit-Patches/0058-Colour-Console-Messages.patch
@@ -1,14 +1,14 @@
-From 33ca90c41ee7904b893c767d1ea6e66f55c83778 Mon Sep 17 00:00:00 2001
+From 3e3ad5a9e5de8bd5cd84d5d478c0b8ac8b2b7333 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 10:11:46 +1000
 Subject: [PATCH] Colour Console Messages
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 33eaecc..413e3d8 100644
+index e5b8391..e8e3c9e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -917,7 +917,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -919,7 +919,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      }
  
      public void sendMessage(ChatMessage chatmessage) {
diff --git a/CraftBukkit-Patches/0063-Player-Collision-API.patch b/CraftBukkit-Patches/0063-Player-Collision-API.patch
index 11cca54d57..0af3de8d78 100644
--- a/CraftBukkit-Patches/0063-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0063-Player-Collision-API.patch
@@ -1,11 +1,11 @@
-From a9a560dff16cb6e448c85a9f664bab13a424e463 Mon Sep 17 00:00:00 2001
+From 36ad0071b43b9043ad4f0490d4ea33b2f2706d65 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 adb27d8..0a35df8 100644
+index 8c5a8ba..b180933 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -411,7 +411,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@@ -18,11 +18,11 @@ index adb27d8..0a35df8 100644
                      Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6b8b8dd..34683a5 100644
+index 76dfa81..de07560 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1462,7 +1462,7 @@ public abstract class EntityLiving extends Entity {
-     protected void bi() {
+@@ -1463,7 +1463,7 @@ public abstract class EntityLiving extends Entity {
+     protected void bj() {
          List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
  
 -        if (list != null && !list.isEmpty()) {
@@ -31,10 +31,10 @@ index 6b8b8dd..34683a5 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 f9ac1e1..9ff8c86 100644
+index d054efe..6c55250 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -54,6 +54,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -56,6 +56,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public double maxHealthCache;
      public int lastPing = -1; // Spigot
      // CraftBukkit end
@@ -48,16 +48,16 @@ index f9ac1e1..9ff8c86 100644
 +    }
 +
 +    @Override
-+    public boolean K()
++    public boolean M()
 +    {
-+        return this.collidesWithEntities && super.K();
++        return this.collidesWithEntities && super.M();
 +    }
 +    // Spigot end
  
      public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
          super(world, s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9da9863..654c3c9 100644
+index 4bae056..e7ea9b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1122,6 +1122,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch
index c19db6ea26..2f8931bb16 100644
--- a/CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,15 +1,15 @@
-From 327957a56aa86e4278af0f73d85ad1e6d225ecbf Mon Sep 17 00:00:00 2001
+From 7b6f20a1b6e3ed59aeb5e458a9c9ff676fbb2df2 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 413e3d8..d186e47 100644
+index e8e3c9e..4a72f2c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -498,11 +498,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
-         this.H = Packet.p;
+@@ -500,11 +500,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+         this.I = Packet.p;
          this.methodProfiler.b();
          this.methodProfiler.a("snooper");
 -        if (!this.n.d() && this.ticks > 100) {
diff --git a/CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch b/CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch
index b9ff9599b3..a826597198 100644
--- a/CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch
+++ b/CraftBukkit-Patches/0070-Nerf-Zombie-Lag-Issues.patch
@@ -1,4 +1,4 @@
-From 1d2d7a8171ed042710cb3fa421cb38d85b1b02f7 Mon Sep 17 00:00:00 2001
+From 6649bf8e5ea40c1620570364905bb6d8deabbfa8 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Sat, 14 Sep 2013 11:02:34 +1000
 Subject: [PATCH] Nerf Zombie Lag Issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Nerf Zombie Lag Issues
 Nerf the Zombie Lag issues in MC 1.6 - "Fixes" MC-17630
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java
-index afd726f..faa46e0 100644
+index a07c6cf..ee4bc7e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java
 @@ -63,19 +63,88 @@ public class PathfinderGoalMeleeAttack extends PathfinderGoal {
@@ -26,12 +26,12 @@ index afd726f..faa46e0 100644
          this.b.getControllerLook().a(entityliving, 30.0F, 30.0F);
 +        double goalDistanceSq = this.b.e( entityliving.locX, entityliving.boundingBox.b, entityliving.locZ ); // Spigot
          if ((this.e || this.b.getEntitySenses().canSee(entityliving)) && --this.h <= 0) {
--            this.h = 4 + this.b.aC().nextInt(7);
+-            this.h = 4 + this.b.aD().nextInt(7);
 -            this.b.getNavigation().a((Entity) entityliving, this.d);
 +            // Spigot start
 +            double targetMovement = entityliving.e( pathX, pathY, pathZ );
 +            // If this is true, then we are re-pathing
-+            if ( ( this.h <= 0 && targetMovement >= 1.0D ) || ( this.h <= 0 && this.b.aC().nextInt( 200 ) == 0 ) ) /* EntityCreature random instance */
++            if ( ( this.h <= 0 && targetMovement >= 1.0D ) || ( this.h <= 0 && this.b.aD().nextInt( 200 ) == 0 ) ) /* EntityCreature random instance */
 +
 +            {
 +                AttributeInstance rangeAttr = this.b.getAttributeInstance( GenericAttributes.b );
@@ -66,7 +66,7 @@ index afd726f..faa46e0 100644
 +                pathX = entityliving.locX;
 +                pathY = entityliving.boundingBox.b;
 +                pathZ = entityliving.locZ;
-+                this.h = 4 + this.b.aC().nextInt( 7 ); /* EntityCreature random instance */
++                this.h = 4 + this.b.aD().nextInt( 7 ); /* EntityCreature random instance */
 +
 +                if ( goalDistanceSq > 256.0D )
 +                {
@@ -86,7 +86,7 @@ index afd726f..faa46e0 100644
 +                {
 +                    if ( fullRangeSearchDelay <= 0 )
 +                    {
-+                        fullRangeSearchDelay = 4 + this.b.aC().nextInt( 4 ); /* EntityCreature random instance */
++                        fullRangeSearchDelay = 4 + this.b.aD().nextInt( 4 ); /* EntityCreature random instance */
 +                    }
 +                }
 +            }
@@ -100,7 +100,7 @@ index afd726f..faa46e0 100644
 +        if (goalDistanceSq <= d0) { // Spigot
              if (this.c <= 0) {
                  this.c = 20;
-                 if (this.b.aY() != null) {
+                 if (this.b.aZ() != null) {
 -- 
 1.8.1.2
 
diff --git a/CraftBukkit-Patches/0072-Minecraft-1.6.4.patch b/CraftBukkit-Patches/0072-Minecraft-1.6.4.patch
deleted file mode 100644
index bd0ec16f93..0000000000
--- a/CraftBukkit-Patches/0072-Minecraft-1.6.4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cbcb581dd09d719f3c1dd95f504b201e791371d3 Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Fri, 20 Sep 2013 08:25:33 +1000
-Subject: [PATCH] Minecraft 1.6.4
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d186e47..d6aa785 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -762,7 +762,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
-     }
- 
-     public String getVersion() {
--        return "1.6.2";
-+        return "1.6.4";
-     }
- 
-     public int A() {
-diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index a5c3104..e9e9e5c 100644
---- a/src/main/java/net/minecraft/server/PendingConnection.java
-+++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -80,8 +80,8 @@ public class PendingConnection extends Connection {
-         } else {
-             PublicKey publickey = this.server.H().getPublic();
- 
--            if (packet2handshake.d() != 74) {
--                if (packet2handshake.d() > 74) {
-+            if (packet2handshake.d() != 78) {
-+                if (packet2handshake.d() > 78) {
-                     this.disconnect(org.spigotmc.SpigotConfig.outdatedServerMessage); // Spigot
-                 } else {
-                     this.disconnect(org.spigotmc.SpigotConfig.outdatedClientMessage); // Spigot
-@@ -160,7 +160,7 @@ public class PendingConnection extends Connection {
-                 s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
-             } else {
-                 // CraftBukkit start - Don't create a list from an array
--                Object[] list = new Object[] { 1, 74, this.server.getVersion(), pingEvent.getMotd(), playerlist.getPlayerCount(), pingEvent.getMaxPlayers() };
-+                Object[] list = new Object[] { 1, 78, this.server.getVersion(), pingEvent.getMotd(), playerlist.getPlayerCount(), pingEvent.getMaxPlayers() };
- 
-                 StringBuilder builder = new StringBuilder();
-                 for (Object object : list) {
--- 
-1.8.1.2
-