diff options
Diffstat (limited to 'patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch')
| -rw-r--r-- | patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch new file mode 100644 index 0000000000..703394db19 --- /dev/null +++ b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Sun, 24 Mar 2019 00:21:23 -0400 +Subject: [PATCH] Fixes and additions to the spawn reason API + +Expose an entities spawn reason on the entity. +Pre existing entities will return NATURAL if it was a non +persistenting Living Entity, SPAWNER for spawners, +or DEFAULT since data was not stored. + +Additionally, add missing spawn reasons. + +Co-authored-by: Aurora <[email protected]> +Co-authored-by: Jakub Zacek <[email protected]> + +diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java +index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae2540a97288 100644 +--- a/src/main/java/org/bukkit/entity/Entity.java ++++ b/src/main/java/org/bukkit/entity/Entity.java +@@ -857,5 +857,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent + // TODO remove impl here + return getLocation().getChunk(); + } ++ ++ /** ++ * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that initially spawned this entity. <!-- Paper - added "initially" to clarify that the SpawnReason doesn't change after the Entity was initially spawned" --> ++ */ ++ @NotNull ++ org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); + // Paper end + } +diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +index 15cb5ea4b68eca070f73d2b899543274415ad240..2de81ee445824562aec7b52b7369b75280aab959 100644 +--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java ++++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +@@ -206,6 +206,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent { + * When a creature is spawned by an enchantment + */ + ENCHANTMENT, ++ // Paper start - Fixes and additions to the SpawnReason API ++ /** ++ * When an entity spawns from an ominous item spawner ++ */ ++ OMINOUS_ITEM_SPAWNER, ++ // Paper end - Fixes and additions to the SpawnReason API + /** + * When a creature is spawned by plugins + */ |