Update upstream B/CB

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

@@ -1,14 +1,14 @@
-From 69e9d85562dfdfa22265b2a96b322207b3c20275 Mon Sep 17 00:00:00 2001
+From 9255c7c4f217118a550d9492fa7aa6e33a921841 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 c2ca83c..efeaf4c 100644
+index 69bdb460..c0b7426d 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -472,4 +472,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -486,4 +486,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
  
      Spigot spigot();
      // Spigot End
@@ -25,7 +25,7 @@ index c2ca83c..efeaf4c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index bc56fa2..360e149 100644
+index bc56fa22..360e1493 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -59,4 +59,13 @@ public interface FallingBlock extends Entity {
@@ -43,7 +43,7 @@ index bc56fa2..360e149 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index 3ce322d..69df487 100644
+index 3ce322d9..69df487b 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -35,4 +35,13 @@ public interface TNTPrimed extends Explosive {
@@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 -- 
-2.9.3
+2.12.0.windows.1