mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2017-06-02 23:41:05 -05:00
parent adab11a1f7
commit 04d2d38581
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
5 changed files with 33 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Spigot-API-Patches/0007-Entity-Origin-API.patch
View file

@ -1,4 +1,4 @@
From bafc92cd32e071029e7b2737dbff78255953084d Mon Sep 17 00:00:00 2001
From be3a8fec9af1e3d9ee43646c8572b98cf80721b4 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
@ -25,10 +25,10 @@ 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
@@ -59,4 +59,13 @@ public interface FallingBlock extends Entity {
@@ -59,4 +59,15 @@ public interface FallingBlock extends Entity {
* @param hurtEntities whether entities will be damaged by this block.
*/
void setHurtEntities(boolean hurtEntities);
@ -40,13 +40,15 @@ 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
@@ -35,4 +35,13 @@ public interface TNTPrimed extends Explosive {
@@ -35,4 +35,15 @@ public interface TNTPrimed extends Explosive {
* @return the source of this primed TNT
*/
public Entity getSource();
@ -58,8 +60,10 @@ index 3ce322d9..69df487b 100644
+ * @deprecated replaced by {@link Entity#getOrigin()}
+ */
+ @Deprecated
+ public org.bukkit.Location getSourceLoc();
+ default org.bukkit.Location getSourceLoc() {
+ return this.getOrigin();
+ }
}
--
2.13.0
2.13.0.windows.1