From cd35b5e5b0e1e1b2bc005a66f2cc47c7601ad7bd Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 31 Jan 2013 16:56:47 +1100
Subject: [PATCH] Update to CraftBukkit 1.4.7-R1

---
 Bukkit-Patches/0001-Spigot-POM-Changes.patch           |  6 +++---
 CraftBukkit-Patches/0001-Spigot-changes.patch          | 10 +++++-----
 .../0013-Update-pom-with-Spigot-specific-info.patch    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
index 4f2188c..5c2a423 100644
--- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch
+++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 544382fe5360586b80a22f57b369208ca27e4f26 Mon Sep 17 00:00:00 2001
+From 8f85fec369bf49bbf9eb6b5418a7f584c9ad440b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Sat, 5 Jan 2013 15:34:12 +1100
 Subject: [PATCH] Spigot POM Changes
@@ -8,7 +8,7 @@ Subject: [PATCH] Spigot POM Changes
  1 file changed, 4 insertions(+), 32 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 5f58174..557b167 100644
+index 18bda4b..b531cec 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,15 @@
@@ -18,7 +18,7 @@ index 5f58174..557b167 100644
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.4.7-R0.2-SNAPSHOT</version>
+     <version>1.4.7-R1.1-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>
diff --git a/CraftBukkit-Patches/0001-Spigot-changes.patch b/CraftBukkit-Patches/0001-Spigot-changes.patch
index 6f73be0..cdb68a0 100644
--- a/CraftBukkit-Patches/0001-Spigot-changes.patch
+++ b/CraftBukkit-Patches/0001-Spigot-changes.patch
@@ -1,4 +1,4 @@
-From 47c9f07d091d4669fd669569ee924ba083c19b21 Mon Sep 17 00:00:00 2001
+From 92f2c13f80e1503d4e5812a26f1fe34d77098272 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 29 Jan 2013 16:51:35 +1100
 Subject: [PATCH] Spigot changes.
@@ -66,7 +66,7 @@ index a689360..b97a549 100644
 +/dependency-reduced-pom.xml
 \ No newline at end of file
 diff --git a/pom.xml b/pom.xml
-index f0b0bfb..bd394ae 100644
+index d697ca1..b8d2ccb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -51,8 +51,8 @@
@@ -585,7 +585,7 @@ index fac9ea5..43a24f5 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f669a00..dee6579 100644
+index e9f6a6b..b15a1d1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -253,7 +253,7 @@ public abstract class PlayerList {
@@ -597,7 +597,7 @@ index f669a00..dee6579 100644
          } else {
              String s2 = socketaddress.toString();
  
-@@ -913,7 +913,13 @@ public abstract class PlayerList {
+@@ -921,7 +921,13 @@ public abstract class PlayerList {
  
      public void r() {
          while (!this.players.isEmpty()) {
@@ -1596,7 +1596,7 @@ index 0000000..e30615f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f0e24d2..1c61830 100644
+index b6c7b1c..992131c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -212,10 +212,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch b/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch
index 60b36b8..840d599 100644
--- a/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch
+++ b/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch
@@ -1,4 +1,4 @@
-From 85c87e793adf22f192b06945bdb404e2bc51c5b0 Mon Sep 17 00:00:00 2001
+From bc8a4cf3a67ffba7b91944b2bce7aab2395e09cd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Tue, 15 Jan 2013 11:48:54 +1100
 Subject: [PATCH] Update pom with Spigot specific info.
@@ -8,7 +8,7 @@ Subject: [PATCH] Update pom with Spigot specific info.
  1 file changed, 4 insertions(+), 30 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index a09a7c4..e08f4fd 100644
+index 636509a..5a1a5dd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -20,7 +20,7 @@ index a09a7c4..e08f4fd 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.4.7-R0.2-SNAPSHOT</version>
+   <version>1.4.7-R1.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>