Update upstream B/CB

Closes GH-569

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

@@ -1,14 +1,14 @@
-From 27d1d26ddfd181c7d237e8914dcf372291982e99 Mon Sep 17 00:00:00 2001
+From 69e9d85562dfdfa22265b2a96b322207b3c20275 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 cf4118e..15cf7c0 100644
+index c2ca83c..efeaf4c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -440,4 +440,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -472,4 +472,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
  
      Spigot spigot();
      // Spigot End
@@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 -- 
-2.10.2
+2.9.3