2018-12-21 16:09:17 +00:00
|
|
|
From 37ea574289bb7d3eaae4045a22c9bbc07ecd7672 Mon Sep 17 00:00:00 2001
|
2016-02-29 23:09:49 +00:00
|
|
|
From: Byteflux <byte@byteflux.net>
|
|
|
|
Date: Mon, 29 Feb 2016 17:50:31 -0600
|
2016-03-25 09:02:35 +00:00
|
|
|
Subject: [PATCH] Entity Origin API
|
2016-02-29 23:09:49 +00:00
|
|
|
|
|
|
|
|
2016-03-25 09:02:35 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
2018-12-21 16:09:17 +00:00
|
|
|
index 236cddb2..015a4c56 100644
|
2016-03-25 09:02:35 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
2018-12-21 16:09:17 +00:00
|
|
|
@@ -559,4 +559,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
|
2017-05-15 16:25:20 +00:00
|
|
|
@Override
|
2016-03-25 09:02:35 +00:00
|
|
|
Spigot spigot();
|
2017-05-15 16:25:20 +00:00
|
|
|
// Spigot end
|
2016-03-25 09:02:35 +00:00
|
|
|
+
|
|
|
|
+ // 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
|
|
|
|
+ */
|
|
|
|
+ Location getOrigin();
|
|
|
|
+ // Paper end
|
|
|
|
}
|
2016-02-29 23:09:49 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
|
2018-12-21 16:09:17 +00:00
|
|
|
index 0cd830d9..170a9aee 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
|
2018-07-22 05:27:46 +00:00
|
|
|
@@ -51,4 +51,15 @@ public interface FallingBlock extends Entity {
|
2016-02-29 23:09:49 +00: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
|
2016-03-25 09:02:35 +00:00
|
|
|
+ * @deprecated replaced by {@link Entity#getOrigin()}
|
2016-02-29 23:09:49 +00:00
|
|
|
+ */
|
2016-03-25 09:02:35 +00:00
|
|
|
+ @Deprecated
|
2017-06-03 04:41:05 +00:00
|
|
|
+ default org.bukkit.Location getSourceLoc() {
|
|
|
|
+ return this.getOrigin();
|
|
|
|
+ }
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
|
2018-12-21 16:09:17 +00:00
|
|
|
index a439eaf5..04cc23ef 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
|
2018-11-03 00:23:27 +00:00
|
|
|
@@ -37,4 +37,15 @@ public interface TNTPrimed extends Explosive {
|
2016-02-29 23:09:49 +00:00
|
|
|
* @return the source of this primed TNT
|
|
|
|
*/
|
|
|
|
public Entity getSource();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the source block location of the TNTPrimed
|
|
|
|
+ *
|
|
|
|
+ * @return the source block location the TNTPrimed was spawned from
|
2016-03-25 09:02:35 +00:00
|
|
|
+ * @deprecated replaced by {@link Entity#getOrigin()}
|
2016-02-29 23:09:49 +00:00
|
|
|
+ */
|
2016-03-25 09:02:35 +00:00
|
|
|
+ @Deprecated
|
2017-06-03 04:41:05 +00:00
|
|
|
+ default org.bukkit.Location getSourceLoc() {
|
|
|
|
+ return this.getOrigin();
|
|
|
|
+ }
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
--
|
2018-12-21 16:09:17 +00:00
|
|
|
2.20.1
|
2016-02-29 23:09:49 +00:00
|
|
|
|