diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index 9adbac5915..1e57a5e382 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Tue, 9 Dec 2014 20:03:21 -0600
+Date: Tue, 6 Jan 2015 22:12:31 -0600
 Subject: [PATCH] POM changes
 
 
@@ -9,18 +9,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-     <modelVersion>4.0.0</modelVersion>
+         <version>9</version>
+     </parent>
+ 
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>org.github.paperspigot</groupId>
 +    <artifactId>paperspigot-api</artifactId>
      <version>1.8-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
 -    <name>Spigot-API</name>
--    <url>http://www.spigotmc.org</url>
+-    <url>http://www.spigotmc.org/</url>
 +    <name>PaperSpigot-API</name>
-+    <url>https://github.com/PaperSpigot/Paper</url>
++    <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
+     <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/POM-changes.patch b/Spigot-Server-Patches/POM-changes.patch
index c9629f06ea..75d954d802 100644
--- a/Spigot-Server-Patches/POM-changes.patch
+++ b/Spigot-Server-Patches/POM-changes.patch
@@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -  <name>Spigot</name>
 -  <url>http://www.spigotmc.org</url>
 +  <name>PaperSpigot</name>
-+  <url>https://github.com/PaperSpigot/Paper</url>
++  <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch b/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch
index 0f9847a186..21f5d3b344 100644
--- a/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch
+++ b/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch
@@ -149,6 +149,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (itemstack != null && itemstack.count > this.getMaxStackSize()) {
              itemstack.count = this.getMaxStackSize();
          }
--- 
-1.9.5.msysgit.0
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
index 74f462eee1..8bb8215092 100644
--- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
@@ -4,19 +4,6 @@ Date: Fri, 28 Nov 2014 00:35:56 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
-diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemBlock.java
-+++ b/src/main/java/net/minecraft/server/ItemBlock.java
-@@ -0,0 +0,0 @@ public class ItemBlock extends Item {
-             return false;
-         } else if (blockposition.getY() == 255 && this.a.getMaterial().isBuildable()) {
-             return false;
--        } else if (world.a(this.a, blockposition, false, enumdirection, (Entity) null, itemstack)) {
-+        } else if (world.a(this.a, blockposition, false, enumdirection, entityhuman, itemstack)) { // PaperSpigot - Pass entityhuman instead of null
-             int i = this.filterData(itemstack.getData());
-             IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
-
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
@@ -55,6 +42,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (movingobjectposition != null) {
              if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.aq();
+diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ItemBlock.java
++++ b/src/main/java/net/minecraft/server/ItemBlock.java
+@@ -0,0 +0,0 @@ public class ItemBlock extends Item {
+             return false;
+         } else if (blockposition.getY() == 255 && this.a.getMaterial().isBuildable()) {
+             return false;
+-        } else if (world.a(this.a, blockposition, false, enumdirection, (Entity) null, itemstack)) {
++        } else if (world.a(this.a, blockposition, false, enumdirection, entityhuman, itemstack)) { // PaperSpigot - Pass entityhuman instead of null
+             int i = this.filterData(itemstack.getData());
+             IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
+ 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/World.java