66 lines
2.9 KiB
Diff
66 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 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 c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d2e6f8bf6 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -791,5 +791,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
|
|
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName())));
|
|
}
|
|
+
|
|
+ /**
|
|
+ * 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
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
index d96fd494b523491fcf1ac54d164351fd487f65d6..ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9 100644
|
|
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
|
|
@@ -126,4 +126,15 @@ public interface FallingBlock extends Entity {
|
|
* @param damage the max damage to set. Must be >= 0
|
|
*/
|
|
void setMaxDamage(int damage);
|
|
+
|
|
+ /**
|
|
+ * Gets the source block location of the FallingBlock
|
|
+ *
|
|
+ * @return the source block location the FallingBlock was spawned from
|
|
+ * @deprecated replaced by {@link Entity#getOrigin()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ 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 a23cfdf66877f0a61eae700de084c76e6ee7b431..0813bd913c8fdb2001963ce3e82c07c2af105418 100644
|
|
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
|
|
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
|
|
@@ -53,4 +53,15 @@ public interface TNTPrimed extends Explosive {
|
|
* @param source the source of this primed TNT
|
|
*/
|
|
public void setSource(@Nullable Entity source);
|
|
+
|
|
+ /**
|
|
+ * Gets the source block location of the TNTPrimed
|
|
+ *
|
|
+ * @return the source block location the TNTPrimed was spawned from
|
|
+ * @deprecated replaced by {@link Entity#getOrigin()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ default org.bukkit.Location getSourceLoc() {
|
|
+ return this.getOrigin();
|
|
+ }
|
|
}
|