Update upstream B/CB/S

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

@@ -1,14 +1,14 @@
-From afc54113a05902a020f9d36d62e7de74fce3f3b2 Mon Sep 17 00:00:00 2001
+From b6b21b6bdacb1ea6abdd132e3f173822ef543836 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 0263e9cc..a2714118 100644
+index 4f5eb367..d793de62 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -546,4 +546,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -557,4 +557,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
@@ -65,5 +65,5 @@ index fcd0a9b2..2abef57c 100644
 +    }
  }
 -- 
-2.19.0
+2.19.1