Update upstream B/CB/S

Spigot-API-Patches/0007-Entity-Origin-API.patch

@@ -1,14 +1,14 @@
-From 3ce5b4bd388da96e7866319ee200652797a3b74b Mon Sep 17 00:00:00 2001
+From 542ce731cfb33acb2fce81a466b20e2e121ab269 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 aa7cc17..434334a 100644
+index cbcc835..27b429e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -421,4 +421,15 @@ public interface Entity extends Metadatable, CommandSender {
+@@ -435,4 +435,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.8.3
+2.10.0.windows.1