From 2405e7c1696cd0bc062599e46656bac46711853b Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Mon, 12 Jan 2015 11:21:32 -0600
Subject: [PATCH] Rebuild patches for upstream changes

---
 Spigot-Server-Patches/0001-POM-changes.patch      | 15 +++++++--------
 .../0040-Add-TNT-source-location-API.patch        |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Spigot-Server-Patches/0001-POM-changes.patch b/Spigot-Server-Patches/0001-POM-changes.patch
index 538205bba7..8a9cc0bcab 100644
--- a/Spigot-Server-Patches/0001-POM-changes.patch
+++ b/Spigot-Server-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From 430846a2db570b9661fa265301862124f1b12a4e Mon Sep 17 00:00:00 2001
+From e7cac10d2cbd228ba6715da4592dcf78ba0a0303 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
-Date: Fri, 5 Dec 2014 22:04:50 -0600
+Date: Mon, 12 Jan 2015 11:21:04 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 058ba61..6851741 100644
+index bcd3a30..003caf1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -25,7 +25,7 @@ index 058ba61..6851741 100644
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -21,8 +21,8 @@
+@@ -21,16 +21,16 @@
    </properties>
  
    <parent>
@@ -36,7 +36,6 @@ index 058ba61..6851741 100644
      <version>dev-SNAPSHOT</version>
      <relativePath>../pom.xml</relativePath>
    </parent>
-@@ -36,8 +36,8 @@
  
    <dependencies>
      <dependency>
@@ -47,11 +46,11 @@ index 058ba61..6851741 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -124,12 +124,12 @@
+@@ -113,12 +113,12 @@
          </configuration>
          <executions>
            <execution>
--            <id>ex-spigot</id>            
+-            <id>ex-spigot</id>
 +            <id>ex-paperspigot</id>
              <configuration>
 -              <outputPrefix>git-Spigot-</outputPrefix>
@@ -63,7 +62,7 @@ index 058ba61..6851741 100644
              </configuration>
              <phase>compile</phase>
              <goals>
-@@ -160,7 +160,7 @@
+@@ -149,7 +149,7 @@
              <manifestEntries>
                <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                <Implementation-Title>CraftBukkit</Implementation-Title>
diff --git a/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch
index 9f50473251..259d84258d 100644
--- a/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch
+++ b/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch
@@ -1,4 +1,4 @@
-From f98008a45418decdfd9e5431a19b0db37a5c8102 Mon Sep 17 00:00:00 2001
+From 3b47798957e30cac50039bc76fab6c6cc11da68b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 30 Nov 2014 22:57:18 -0600
 Subject: [PATCH] Add TNT source location API
@@ -98,10 +98,10 @@ index b5763bb..611bac8 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 2a42eff..870ac0c 100644
+index 3688fa5..be2b88f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1090,7 +1090,8 @@ public class CraftWorld implements World {
+@@ -1115,7 +1115,8 @@ public class CraftWorld implements World {
                  throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
              }
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {