mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 11:58:06 +01:00
101b011009
Upstream has released updates that appears 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:
0e90062a Remove draft API from entity persistence
CraftBukkit Changes:
13fc33f73 #744: Add ability to get location from smithing inventory
68 lines
2.5 KiB
Diff
68 lines
2.5 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 b46653655d1da3ffe54d91b038ec360cd77f0c44..573d959a0a534b72338566eea0a9eca4124dba92 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -595,4 +595,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
@Override
|
|
Spigot spigot();
|
|
// 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
|
|
}
|
|
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 5a87893248d9cbeb7c431590e726fcb0f69f930d..3022b4a270e66c4654193c96faf35bee817e648a 100644
|
|
--- 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 {
|
|
*/
|
|
@Nullable
|
|
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()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ default org.bukkit.Location getSourceLoc() {
|
|
+ return this.getOrigin();
|
|
+ }
|
|
}
|