diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index e76c0b749..265557b48 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 69e9d85562dfdfa22265b2a96b322207b3c20275 Mon Sep 17 00:00:00 2001
+From 9255c7c4f217118a550d9492fa7aa6e33a921841 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c2ca83c..efeaf4c 100644
+index 69bdb460..c0b7426d 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -472,4 +472,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -486,4 +486,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
  
      Spigot spigot();
      // Spigot End
@@ -25,7 +25,7 @@ index c2ca83c..efeaf4c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index bc56fa2..360e149 100644
+index bc56fa22..360e1493 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -59,4 +59,13 @@ public interface FallingBlock extends Entity {
@@ -43,7 +43,7 @@ index bc56fa2..360e149 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index 3ce322d..69df487 100644
+index 3ce322d9..69df487b 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -35,4 +35,13 @@ public interface TNTPrimed extends Explosive {
@@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 8eed7ff43..51ab67ec0 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From 2406e88f815b2868a20d896fd3955ebe5df4b42f Mon Sep 17 00:00:00 2001
+From b5f277e2bad37806c03c3365f09a0741c73f107e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4d28933..26e0702 100644
+index 8fd884314..1e2e042b7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
@@ -51,7 +51,7 @@ index 4d28933..26e0702 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 4c168d3..307a44c 100644
+index 4c168d333..307a44c85 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -247,6 +247,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index 4c168d3..307a44c 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index fd07356..25e471d 100644
+index fd0735611..25e471d37 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -108,6 +108,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index fd07356..25e471d 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 688f405..ca641ab 100644
+index 70d62e8d0..e39b966c5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
@@ -106,10 +106,10 @@ index 688f405..ca641ab 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 7d9b000..0167ed0 100644
+index b3cd6ec17..6497905b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -701,4 +701,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -711,4 +711,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -123,7 +123,7 @@ index 7d9b000..0167ed0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index b0a7f63..56666f1 100644
+index b0a7f6392..56666f1f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 @@ -65,4 +65,11 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
@@ -139,7 +139,7 @@ index b0a7f63..56666f1 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
-index c493c9c..93843aa 100644
+index c493c9c0c..93843aa50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
 @@ -65,4 +65,11 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 
diff --git a/work/Bukkit b/work/Bukkit
index dd4b40424..baf4ff4d9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit dd4b40424c2afeca8bb5f5bb6234db1ee35933f6
+Subproject commit baf4ff4d9774fbde0f7dae677d81c76b0c452eb0
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 2aa5ac6c9..dfee3d9f9 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 2aa5ac6c92a0e53ae917cae348d662d014ef9366
+Subproject commit dfee3d9f9f3b8ea63c21a5c8858f78aa89d3b24d