Update upstream B/CB

This commit is contained in:
Zach Brown
2017-06-02 23:41:05 -05:00
parent 9cf2e3b3dc
commit 74ffc20767
5 changed files with 25 additions and 53 deletions

View File

@@ -25,7 +25,7 @@ index 0144bef9..fbff9860 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
index bc56fa22..360e1493 100644
index bc56fa22..ad2cd13e 100644
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
@@ -0,0 +0,0 @@ public interface FallingBlock extends Entity {
@@ -40,10 +40,12 @@ index bc56fa22..360e1493 100644
+ * @deprecated replaced by {@link Entity#getOrigin()}
+ */
+ @Deprecated
+ public org.bukkit.Location getSourceLoc();
+ default org.bukkit.Location getSourceLoc() {
+ return this.getOrigin();
+ }
}
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
index 3ce322d9..69df487b 100644
index fcd0a9b2..2abef57c 100644
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
@@ -0,0 +0,0 @@ public interface TNTPrimed extends Explosive {
@@ -58,6 +60,8 @@ index 3ce322d9..69df487b 100644
+ * @deprecated replaced by {@link Entity#getOrigin()}
+ */
+ @Deprecated
+ public org.bukkit.Location getSourceLoc();
+ default org.bukkit.Location getSourceLoc() {
+ return this.getOrigin();
+ }
}
--