Upstream merge.

Bukkit

@@ -1 +1 @@
-Subproject commit e7f3d552215a9d117a4616801e14e715d4425efb
+Subproject commit 1f83111208ab3612f384a2e6b65cc28423dc625e

Bukkit-Patches/0006-BungeeCord-Support.patch

@@ -1,14 +1,14 @@
-From d4a9dfb80cd5f9f6a45bd291e8297a749f665b2c Mon Sep 17 00:00:00 2001
+From 90e7f1b07d3998ff3eabc59edb00fe2993b02eb8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ab022b5..39d3800 100644
+index 3ec374b..cc9c3b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -709,4 +709,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -721,4 +721,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @see Player#setHealthScaled(boolean)
       */
      public double getHealthScale();

Bukkit-Patches/0008-Add-Particle-API.patch

@@ -1,11 +1,11 @@
-From 67d547e70742f6fe39e9b675cb1ede34f413ceed Mon Sep 17 00:00:00 2001
+From ae6b528446bfbe1c5c5e8d4301287364f0cc8ddd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
 
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 175750f..ae1f4fd 100644
+index 708bee9..62c7c11 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -5,6 +5,7 @@ import java.util.Map;
@@ -16,7 +16,7 @@ index 175750f..ae1f4fd 100644
  import org.bukkit.potion.Potion;
  
  /**
-@@ -78,33 +79,193 @@ public enum Effect {
+@@ -78,27 +79,178 @@ public enum Effect {
      /**
       * The flames seen on a mobspawner; a visual effect.
       */
@@ -196,9 +196,10 @@ index 175750f..ae1f4fd 100644
       *
 -     * @return ID of this effect
 +     * @return if this Effect isn't of type PARTICLE it returns ID of this effect
+      * @deprecated Magic value
       */
-     public int getId() {
+     @Deprecated
-         return this.id;
+@@ -107,6 +259,15 @@ public enum Effect {
      }
  
      /**
@@ -214,7 +215,7 @@ index 175750f..ae1f4fd 100644
       * @return The type of the effect.
       */
      public Type getType() {
-@@ -112,7 +273,7 @@ public enum Effect {
+@@ -114,7 +275,7 @@ public enum Effect {
      }
  
      /**
@@ -223,7 +224,7 @@ index 175750f..ae1f4fd 100644
       */
      public Class<?> getData() {
          return this.data;
-@@ -130,12 +291,32 @@ public enum Effect {
+@@ -134,12 +295,32 @@ public enum Effect {
  
      static {
          for (Effect effect : values()) {
@@ -259,10 +260,10 @@ index 175750f..ae1f4fd 100644
 +    public enum Type {SOUND, VISUAL, PARTICLE}
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c86cfbc..186bb77 100644
+index 62fadda..39c72c5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1066,6 +1066,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1070,6 +1070,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean isGameRule(String rule);
  
@@ -320,10 +321,10 @@ index c86cfbc..186bb77 100644
       * Represents various map environment types that a world may be
       */
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 39d3800..be2f4dc 100644
+index cc9c3b2..8eab616 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -724,6 +724,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -736,6 +736,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0011-Update-Depends.patch

@@ -1,4 +1,4 @@
-From 7d30d01ca1ae5c7c6fcf81396ad4919360c4e81c Mon Sep 17 00:00:00 2001
+From 69feff718e80cd27a3bcc2f44f11e3f95c271631 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 95d042b..b011de6 100644
+index 2b1abbb..14833af 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -77,21 +77,21 @@
+@@ -78,21 +78,21 @@
          <dependency>
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index 95d042b..b011de6 100644
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
-@@ -105,7 +105,7 @@
+@@ -106,7 +106,7 @@
          <dependency>
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>

Bukkit-Patches/0016-Player-Collision-API.patch

@@ -1,14 +1,14 @@
-From 9836664f97abdff7f7eaa35ee496e496976270e0 Mon Sep 17 00:00:00 2001
+From c5cfcb06166b8f6a1e410bfc19340fdd8e641019 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index be2f4dc..cb99199 100644
+index 8eab616..9ee8f5f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -729,6 +729,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -741,6 +741,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

CraftBukkit

@@ -1 +1 @@
-Subproject commit e74e4dc8a231c11c659bda97221be19dcb5cd524
+Subproject commit fdc56564e248dc0797696c8f6463c2ffda781035

CraftBukkit-Patches/0017-Improved-Timings-System.patch

@@ -1,4 +1,4 @@
-From 81c56b7bec43a3500d86ecb6a76c29155e8b7a43 Mon Sep 17 00:00:00 2001
+From aedca23e7d617be31e381f058f6bd33ddfaad927 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
@@ -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 6aa7a21..1509a30 100644
+index 6444a2f..4c900a6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -947,6 +947,7 @@ public class PlayerConnection extends Connection {
+@@ -939,6 +939,7 @@ public class PlayerConnection extends Connection {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -155,7 +155,7 @@ index 6aa7a21..1509a30 100644
          // CraftBukkit start
          CraftPlayer player = this.getPlayer();
  
-@@ -954,19 +955,23 @@ public class PlayerConnection extends Connection {
+@@ -946,19 +947,23 @@ public class PlayerConnection extends Connection {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {

CraftBukkit-Patches/0024-Netty.patch

@@ -1,11 +1,11 @@
-From ca578c41828399b4afcf18296186814d213d1958 Mon Sep 17 00:00:00 2001
+From b3c7421c34b7679656618b03581a7ff21881b70c 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 0e6c422..401dd2d 100644
+index ac0d198..bd5ff9f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -112,6 +112,21 @@
@@ -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 c9e187e..b433c60 100644
+index 1749059..7f2c1a9 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 c9e187e..b433c60 100644
      }
  
      // CraftBukkit start
-@@ -146,7 +151,7 @@ public class PendingConnection extends Connection {
+@@ -149,7 +154,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 c9e187e..b433c60 100644
                  // CraftBukkit
                  s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
              } else {
-@@ -175,9 +180,18 @@ public class PendingConnection extends Connection {
+@@ -178,9 +183,18 @@ public class PendingConnection extends Connection {
  
              this.networkManager.queue(new Packet255KickDisconnect(s));
              this.networkManager.d();
@@ -160,7 +160,7 @@ index c9e187e..b433c60 100644
              this.b = true;
          } catch (Exception exception) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a9db856..7c39d34 100644
+index 8499c7f..e5a09b3 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,8 @@ import java.io.IOException;

CraftBukkit-Patches/0029-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 7977f412b0d04e21881acf1d1fcae03631cdbe69 Mon Sep 17 00:00:00 2001
+From 1c934e1c78a8d17c3517bbcf230dc728aeeefe88 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 b433c60..0eacd84 100644
+index 7f2c1a9..5593b62 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -234,4 +234,17 @@ public class PendingConnection extends Connection {
+@@ -237,4 +237,17 @@ public class PendingConnection extends Connection {
      static boolean a(PendingConnection pendingconnection, boolean flag) {
          return pendingconnection.h = flag;
      }

CraftBukkit-Patches/0032-Filter-Invalid-Names.patch

@@ -1,20 +1,22 @@
-From df75188d9a61b26b3da65f3458f2abcf18a39e26 Mon Sep 17 00:00:00 2001
+From 528a10480647a939af1c9271765c34f2eaa33c8d 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 0eacd84..e634575 100644
+index 5593b62..5e9dad2 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -66,12 +66,13 @@ public class PendingConnection extends Connection {
+@@ -66,6 +66,7 @@ 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();

CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch

@@ -1,14 +1,14 @@
-From 06367773012a889d6044827499473389d3e3fd29 Mon Sep 17 00:00:00 2001
+From 71aaa40b9d6f728e56c230678bedcba3e04f3a5e 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 1509a30..2d04541 100644
+index 4c900a6..7528703 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1573,7 +1573,7 @@ public class PlayerConnection extends Connection {
+@@ -1565,7 +1565,7 @@ public class PlayerConnection extends Connection {
                      flag = false;
                  } else {
                      for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {

CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch

@@ -1,14 +1,14 @@
-From bafdd4b67c62daebb5e46fd2ec69110ea47c9a27 Mon Sep 17 00:00:00 2001
+From 4ba95ced5c175bebc9ac8f1e0bb143473e5fcb66 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 2d04541..9f8cc39 100644
+index 7528703..f894e24 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -837,7 +837,17 @@ public class PlayerConnection extends Connection {
+@@ -829,7 +829,17 @@ public class PlayerConnection extends Connection {
                  this.chat(s, packet3chat.a_());
  
                  // This section stays because it is only applicable to packets

CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch

@@ -1,14 +1,14 @@
-From ee7d8beccd4867f700f5b368775aca6f429556b2 Mon Sep 17 00:00:00 2001
+From 03a26bff7fe3efbb77258b3aa092bfc079ac1108 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 5d669d0..4dc5688 100644
+index f894e24..27776e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -970,7 +970,12 @@ public class PlayerConnection extends Connection {
+@@ -962,7 +962,12 @@ public class PlayerConnection extends Connection {
          }
  
          try {
@@ -23,7 +23,7 @@ index 5d669d0..4dc5688 100644
                  org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
                  return;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 1ec9272..d64eb0b 100644
+index 710d12c..a1fb71f 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -234,4 +234,10 @@ public class SpigotConfig

CraftBukkit-Patches/0049-Configurable-Messages.patch

@@ -1,14 +1,14 @@
-From a57de3891055b3e336f9439fe3f7cb84341c0560 Mon Sep 17 00:00:00 2001
+From e87093815494e4ca3a4c9d1f7f85bc918a60b278 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 e634575..41f963d 100644
+index 5e9dad2..9deb9d1 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -79,9 +79,9 @@ public class PendingConnection extends Connection {
+@@ -82,9 +82,9 @@ public class PendingConnection extends Connection {
  
              if (packet2handshake.d() != 74) {
                  if (packet2handshake.d() > 74) {
@@ -43,7 +43,7 @@ index 38e0c5b..262682d 100644
                  event.disallow(PlayerLoginEvent.Result.ALLOWED, s2);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 267605b..100396f 100644
+index 0fa69ea..404a626 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -528,11 +528,7 @@ public final class CraftServer implements Server {

CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch

@@ -1,14 +1,14 @@
-From 24f1df5c2d5baa4d5a293d26b7b5b7dfeebe594b Mon Sep 17 00:00:00 2001
+From d0d33c2a76ff2f3296819e8285c903de0c5f3904 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 e634575..c9dda32 100644
+index 9deb9d1..a5c3104 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -111,7 +111,7 @@ public class PendingConnection extends Connection {
+@@ -114,7 +114,7 @@ public class PendingConnection extends Connection {
              }
  
              this.j = true;

CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch

@@ -1,14 +1,14 @@
-From 127323a66fd99fa2f0746e459360244320176f9a Mon Sep 17 00:00:00 2001
+From 3022a362614f2ff5bd8e54ac4db7be1a8d807992 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 4dc5688..0dddd1e 100644
+index 27776e4..1673f2f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1088,6 +1088,13 @@ public class PlayerConnection extends Connection {
+@@ -1080,6 +1080,13 @@ public class PlayerConnection extends Connection {
  
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = worldserver.getEntity(packet7useentity.target);

CraftBukkit-Patches/0063-Client-Crash-Cannot-Send-Message.patch

@@ -1,22 +0,0 @@
-From b105c49aaf6d0d3e2c7065276f349a28661c2608 Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Wed, 10 Jul 2013 23:46:09 +1000
-Subject: [PATCH] Client Crash Cannot Send Message
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0dddd1e..0c0b1b3 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -830,7 +830,7 @@ public class PlayerConnection extends Connection {
- 
-                 // CraftBukkit start
-                 if (this.player.getChatFlags() == 1 && !s.startsWith("/")) {
--                    this.sendPacket(new Packet3Chat("Cannot send chat message."));
-+                    this.player.sendMessage(ChatMessage.d("Cannot send chat message.")); // Spigot - fix client crash
-                     return;
-                 }
- 
--- 
-1.8.1.2
-

CraftBukkit-Patches/0063-Entity-ticking-chunk-caching.patch

@@ -1,4 +1,4 @@
-From d5f7eb5103fedc76dde546763d9c43d45038965d Mon Sep 17 00:00:00 2001
+From 26354fbb3ff5283b869fb241c465d508539f8b6c Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Tue, 16 Jul 2013 03:32:32 +0500
 Subject: [PATCH] Entity ticking chunk caching

CraftBukkit-Patches/0064-Plug-World-Unload-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From abf88361148d182536726699838388895efda957 Mon Sep 17 00:00:00 2001
+From 54c3ceea8ea9090db66f89766911761c7b403c17 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak

CraftBukkit-Patches/0065-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From fe4457ac450fc12b1083ebbd067951921edb8290 Mon Sep 17 00:00:00 2001
+From 1d4628a69a0585ad73dda98159ccbe810a9a0da5 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

CraftBukkit-Patches/0066-Fully-Disable-Snooper-When-Not-Required.patch

@@ -1,4 +1,4 @@
-From fdee0331948e8b1d0373bb083b89c0fb244704c2 Mon Sep 17 00:00:00 2001
+From 576ae6ea5b3348156429e5a72987eaf6184be3df 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

CraftBukkit-Patches/0067-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,4 +1,4 @@
-From 996b74d6e6ccc084c15212dc9d16538b316cfc4b Mon Sep 17 00:00:00 2001
+From b587388cf6df919971622d6b67d78f7750928231 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability

CraftBukkit-Patches/0068-Guard-entity-list.patch

@@ -1,4 +1,4 @@
-From b39f6fbc48f5566ccaf1045c2d11dbc4e352ed63 Mon Sep 17 00:00:00 2001
+From c3d0cccd2b134602ccc7b99039b308efa4c360ee Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 3 Aug 2013 21:42:00 +0500
 Subject: [PATCH] Guard entity list

CraftBukkit-Patches/0069-Cap-Minimum-Player-Speed.patch

@@ -1,4 +1,4 @@
-From e7d9f54f6b102a78e0b81c9c4922b5c82672e519 Mon Sep 17 00:00:00 2001
+From 20ef1354a9a56fd07cfbd6285273acaf7d1edfa2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed

CraftBukkit-Patches/0071-Prevent-Duplicate-Handshakes.patch

@@ -1,21 +0,0 @@
-From cd94b224bb10b79c8d8252d549066b12741c6f3e Mon Sep 17 00:00:00 2001
-From: Nathan Adams <dinnerbone@dinnerbone.com>
-Date: Tue, 3 Sep 2013 11:17:14 +1000
-Subject: [PATCH] Prevent Duplicate Handshakes
-
-
-diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index 3aeff44..f2aa839 100644
---- a/src/main/java/net/minecraft/server/PendingConnection.java
-+++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -68,6 +68,7 @@ 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) {
-+        if (this.g != null) { this.disconnect("Quit repeating yourself."); return; } // Spigot - Thanks Dinnerbone!
-         // CraftBukkit start
-         this.hostname = packet2handshake.c == null ? "" : packet2handshake.c + ':' + packet2handshake.d;
-         // CraftBukkit end
--- 
-1.8.1.2
-