diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index 0811b5e7a..f81cc7ed1 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From 44b8f77d9f563c6ed5482428d75865c97a657613 Mon Sep 17 00:00:00 2001
+From 880a779913939ebd2e21755be3251bf62e40ae7a 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
@@ -24,19 +24,20 @@ index 75b1fb2..8881878 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index b46b9c4..c91b12c 100644
+index b46b9c4..a386001 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-@@ -40,4 +40,14 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
+@@ -40,4 +40,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
      public EntityType getType() {
          return EntityType.ARROW;
      }
 +
 +    // Spigot start
-+    private final Spigot spigot = new Spigot()
++    private final Arrow.Spigot spigot = new Arrow.Spigot()
 +    {
 +    };
-+    public Spigot spigot()
++
++    public Arrow.Spigot spigot()
 +    {
 +        return spigot;
 +    }
@@ -63,7 +64,7 @@ index 8e2e5cd..b1f86a0 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..3e42b91 100644
+index d5d43c9..3cf0c28 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 {
@@ -72,11 +73,11 @@ index d5d43c9..3e42b91 100644
      }
 +
 +    // Spigot start
-+    private final Spigot spigot = new Spigot()
++    private final Player.Spigot spigot = new Player.Spigot()
 +    {
 +    };
 +
-+    public Spigot spigot()
++    public Player.Spigot spigot()
 +    {
 +        return spigot;
 +    }
diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
index aeb8673d0..b3f4979c1 100644
--- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 55ea05602e8a83d38f8bf38c05a76fbb42c8fac6 Mon Sep 17 00:00:00 2001
+From 7977f412b0d04e21881acf1d1fcae03631cdbe69 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
@@ -59,12 +59,12 @@ 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 6e9834f..29fcdfb 100644
+index 988c6e7..aa49c6c 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 {
      // Spigot start
-     private final Spigot spigot = new Spigot()
+     private final Player.Spigot spigot = new Player.Spigot()
      {
 +        @Override
 +        public InetSocketAddress getRawAddress()
@@ -73,7 +73,7 @@ index 6e9834f..29fcdfb 100644
 +        }
      };
  
-     public Spigot spigot()
+     public Player.Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 index e5a09b3..a598954 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
diff --git a/CraftBukkit-Patches/0038-Implement-Arrow-API.patch b/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
index 29beefed6..2e351570d 100644
--- a/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
@@ -1,16 +1,16 @@
-From 82aec046d5bb347456313d1b11bcbead5aa86942 Mon Sep 17 00:00:00 2001
+From 93a420b1b2fa6da25a0f38fca8dcba69f2e39365 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index c91b12c..d197c5a 100644
+index a386001..e976b83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-@@ -44,7 +44,19 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
+@@ -44,6 +44,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
      // Spigot start
-     private final Spigot spigot = new Spigot()
+     private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
 +        @Override
 +        public double getDamage()
@@ -24,10 +24,8 @@ index c91b12c..d197c5a 100644
 +            getHandle().b( damage );
 +        }
      };
-+
-     public Spigot spigot()
-     {
-         return spigot;
+ 
+     public Arrow.Spigot spigot()
 -- 
 1.8.1.2
 
diff --git a/CraftBukkit-Patches/0039-Particle-API.patch b/CraftBukkit-Patches/0039-Particle-API.patch
index 1795e454b..443532c5a 100644
--- a/CraftBukkit-Patches/0039-Particle-API.patch
+++ b/CraftBukkit-Patches/0039-Particle-API.patch
@@ -1,4 +1,4 @@
-From 3e11089e5462b526055fe72958159aced12cac6f Mon Sep 17 00:00:00 2001
+From aba117a1c6cc8fa223c803c82e879f83cc4ae828 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 16:14:30 +1000
 Subject: [PATCH] Particle API
@@ -152,7 +152,7 @@ index e8bb8ae..a68169f 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 29fcdfb..3231226 100644
+index aa49c6c..9da9863 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -277,13 +277,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -234,7 +234,7 @@ index 29fcdfb..3231226 100644
 +        }
      };
  
-     public Spigot spigot()
+     public Player.Spigot spigot()
 -- 
 1.8.1.2
 
diff --git a/CraftBukkit-Patches/0066-Player-Collision-API.patch b/CraftBukkit-Patches/0066-Player-Collision-API.patch
index 1f39ef491..1cfed9cbc 100644
--- a/CraftBukkit-Patches/0066-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0066-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 9d73975f8eba9e17bc92818862e36e7645302a24 Mon Sep 17 00:00:00 2001
+From fe4457ac450fc12b1083ebbd067951921edb8290 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
@@ -57,7 +57,7 @@ index f9ac1e1..9ff8c86 100644
      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 3231226..1e415db 100644
+index 9da9863..654c3c9 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 {
@@ -79,7 +79,7 @@ index 3231226..1e415db 100644
 +        }
      };
  
-     public Spigot spigot()
+     public Player.Spigot spigot()
 -- 
 1.8.1.2