Update upstream B/CB/S

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

@@ -1,17 +1,17 @@
-From 9255c7c4f217118a550d9492fa7aa6e33a921841 Mon Sep 17 00:00:00 2001
+From bafc92cd32e071029e7b2737dbff78255953084d 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 69bdb460..c0b7426d 100644
+index 0144bef9..fbff9860 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -486,4 +486,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
- 
+@@ -487,4 +487,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+     @Override
      Spigot spigot();
-     // Spigot End
+     // Spigot end
 +
 +    // Paper start
 +    /**
@@ -61,5 +61,5 @@ index 3ce322d9..69df487b 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 -- 
-2.12.0.windows.1
+2.13.0