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

71 lines
2.4 KiB
Diff
Raw Normal View History

From c59a5c4c7d44ac1e718fb648531bdba8132dbe23 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 19dc1e6a8..69307e252 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -580,4 +580,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
2017-05-15 18:25:20 +02:00
@Override
Spigot spigot();
2017-05-15 18:25:20 +02:00
// Spigot end
+
+ // Paper start
+ /**
+ * Gets the location where this entity originates from.
+ * <p>
+ * This value can be null if the entity hasn't yet been added to the world.
+ *
+ * @return Location where entity originates or null if not yet added
+ */
+ @Nullable
+ Location getOrigin();
+ // Paper end
}
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
index 64f9d3fd8..14cb0d770 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
@@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
2016-03-01 00:09:49 +01:00
* @param hurtEntities whether entities will be damaged by this block.
*/
void setHurtEntities(boolean hurtEntities);
+
+ /**
+ * Gets the source block location of the FallingBlock
+ *
+ * @return the source block location the FallingBlock was spawned from
+ * @deprecated replaced by {@link Entity#getOrigin()}
2016-03-01 00:09:49 +01:00
+ */
+ @Deprecated
2017-06-03 06:41:05 +02:00
+ default org.bukkit.Location getSourceLoc() {
+ return this.getOrigin();
+ }
2016-03-01 00:09:49 +01:00
}
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
index 5a8789324..3022b4a27 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
@@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive {
2016-03-01 00:09:49 +01:00
*/
@Nullable
2016-03-01 00:09:49 +01:00
public Entity getSource();
+
+ /**
+ * Gets the source block location of the TNTPrimed
+ *
+ * @return the source block location the TNTPrimed was spawned from
+ * @deprecated replaced by {@link Entity#getOrigin()}
2016-03-01 00:09:49 +01:00
+ */
+ @Deprecated
2017-06-03 06:41:05 +02:00
+ default org.bukkit.Location getSourceLoc() {
+ return this.getOrigin();
+ }
2016-03-01 00:09:49 +01:00
}
--
2.21.0
2016-03-01 00:09:49 +01:00