From d22f14e9330c534ed6520286624f583231359456 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 23 Mar 2015 14:23:25 -0500
Subject: [PATCH] Rebuild patches

---
 .../0023-Remove-invalid-mob-spawner-tile-entities.patch     | 6 +++---
 Spigot-Server-Patches/0031-Player-lookup-improvements.patch | 6 +++---
 .../0035-Add-TNT-source-location-API.patch                  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch
index 1110c5a18..c25ca04bc 100644
--- a/Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,14 +1,14 @@
-From cca0cf4d9897633eccc132aa8668eb7c030d0a9c Mon Sep 17 00:00:00 2001
+From a79300041630ddb0bd165871e199d8bdc604aacb Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sun, 8 Mar 2015 01:06:14 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2141126..ac8b1ba 100644
+index d5922fe..ea61f59 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -786,6 +786,11 @@ public class Chunk {
+@@ -784,6 +784,11 @@ public class Chunk {
              tileentity.D();
              this.tileEntities.put(blockposition, tileentity);
              // CraftBukkit start
diff --git a/Spigot-Server-Patches/0031-Player-lookup-improvements.patch b/Spigot-Server-Patches/0031-Player-lookup-improvements.patch
index 7a3333b6f..b1ae3988a 100644
--- a/Spigot-Server-Patches/0031-Player-lookup-improvements.patch
+++ b/Spigot-Server-Patches/0031-Player-lookup-improvements.patch
@@ -1,4 +1,4 @@
-From a9057aa9345228c4025b27078d2ee70bdee4e459 Mon Sep 17 00:00:00 2001
+From ebe7c6a18c22763d684214011d582a067fdc3b2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 04:03:56 -0500
 Subject: [PATCH] Player lookup improvements
@@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should
 be consistent in performance regardless of how many players are online.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c7d26ce..18c6641 100644
+index 49a14ea..74741cd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -49,6 +49,31 @@ public abstract class PlayerList {
@@ -83,7 +83,7 @@ index c7d26ce..18c6641 100644
              savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
              entityplayer.playerConnection.disconnect("You logged in from another location");
          }
-@@ -1004,6 +1036,7 @@ public abstract class PlayerList {
+@@ -1010,6 +1042,7 @@ public abstract class PlayerList {
      }
  
      public EntityPlayer getPlayer(String s) {
diff --git a/Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch
index 76e218a3c..a4d122307 100644
--- a/Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch
+++ b/Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch
@@ -1,4 +1,4 @@
-From 32751125c3a98428353caa172d8295e3e8630d3e Mon Sep 17 00:00:00 2001
+From 75dede09c4970d9dee8438c4f1430dc1e8ef77b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 04:23:41 -0500
 Subject: [PATCH] Add TNT source location API
@@ -98,10 +98,10 @@ index 50423eb..1daba4e 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4c55e68..5a2ad44 100644
+index d8401c4..6ee6889 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1100,7 +1100,8 @@ public class CraftWorld implements World {
+@@ -1096,7 +1096,8 @@ public class CraftWorld implements World {
                  throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
              }
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {