From 65538782cde89c70de3e55f5945b20c342a58726 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 12 Nov 2016 20:21:46 -0600
Subject: [PATCH] Update upstream B/CB/S

---
 Spigot-API-Patches/0007-Entity-Origin-API.patch    | 8 ++++----
 Spigot-Server-Patches/0025-Entity-Origin-API.patch | 8 ++++----
 work/Bukkit                                        | 2 +-
 work/CraftBukkit                                   | 2 +-
 work/Spigot                                        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index 8c2fc3982..0a26940e0 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 542ce731cfb33acb2fce81a466b20e2e121ab269 Mon Sep 17 00:00:00 2001
+From 9bfa695b5dc689ed703dd12078257d3411799997 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 cbcc835..27b429e 100644
+index 5c64b79..23524b8 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -435,4 +435,15 @@ public interface Entity extends Metadatable, CommandSender {
+@@ -463,4 +463,15 @@ public interface Entity extends Metadatable, CommandSender {
  
      Spigot spigot();
      // Spigot End
@@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 -- 
-2.10.0.windows.1
+2.10.2
 
diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 02afe8f7f..356e7cbe1 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 4bb47c60de037d0bcb5a0714eb4ebe20d1e52f1b Mon Sep 17 00:00:00 2001
+From 3febea393a161f09bef588e1b62c721860f1b0ec 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
@@ -106,10 +106,10 @@ index e3d971c..5b3e50c 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 b35f713..c8435a3 100644
+index 09523de..a24efd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -635,4 +635,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -650,4 +650,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
 +    // Paper end
  }
 -- 
-2.10.1.windows.1
+2.10.2
 
diff --git a/work/Bukkit b/work/Bukkit
index b80e520ac..570e0e675 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b80e520acb9f3e5a14a92a06c08c470290b323cb
+Subproject commit 570e0e67528698b67770ea12e22c82d937fd3080
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 33071ecff..51263e971 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 33071ecfffad01854afcf4e05b8e58e4e9fe7239
+Subproject commit 51263e97187a84338f89698eef187284055a682a
diff --git a/work/Spigot b/work/Spigot
index 72c26058d..de459a282 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 72c26058df3d4c3a8d2e2b3255d3a032623a01f0
+Subproject commit de459a282d9f494bbc5588b461b3e8eacd74f744