mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
b5ce6e3dc5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: eb4b416d PR-822: Add experimental armor trim API 33498e1d PR-831: Add a standard of annotations for Minecraft experimental things and API CraftBukkit Changes: 19de3550d SPIGOT-7315: Bed placement duplicates crops if cancelled 1eb88374e PR-1147: Add experimental armor trim API c4c0bb0e9 Show clean error for invalidly configured server.properties options 3ae90697f Fix UUID not being updated when changing world of MapView e43000601 PR-1164, MC-227255, MC-253819: Fix rotation of beehives and bells Spigot Changes: d2fdfe39 Rebuild patches
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 598abaa82c634178043a29f6caa6ac5221659d06..70a32f89c16439c575d8928332cfed64d1d6ab7e 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -725,5 +725,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 64f9d3fd870d65afd2ee9a85625b149163eee144..14cb0d770561151570ab4399ca5facff43076819 100644
|
|
--- 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 {
|
|
* @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()}
|
|
+ */
|
|
+ @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();
|
|
+ }
|
|
}
|