2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Mar 2019 00:21:23 -0400
2024-07-15 23:35:51 +02:00
Subject: [PATCH] Fixes and additions to the spawn reason API
2021-06-11 14:02:28 +02:00
2024-07-15 23:35:51 +02:00
Expose an entities spawn reason on the entity.
2021-06-11 14:02:28 +02:00
Pre existing entities will return NATURAL if it was a non
persistenting Living Entity, SPAWNER for spawners,
or DEFAULT since data was not stored.
2024-07-15 23:35:51 +02:00
Additionally, add missing spawn reasons.
2023-04-04 11:47:16 +02:00
Co-authored-by: Aurora <aurora@relanet.eu>
2024-07-15 23:35:51 +02:00
Co-authored-by: Jakub Zacek <dawon@dawon.eu>
2023-04-04 11:47:16 +02:00
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
2024-12-03 17:58:41 +01:00
index b808044403e6b38d1801aefde2176d630c747a64..cc1a619e54c2ce0ee49f81534c56d5b55aa5bfc2 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2024-06-03 19:20:43 +02:00
@@ -857,5 +857,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
2021-06-13 11:41:07 +02:00
// TODO remove impl here
return getLocation().getChunk();
}
2021-06-11 14:02:28 +02:00
+
+ /**
2023-04-04 11:47:16 +02:00
+ * @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" -->
2021-06-11 14:02:28 +02:00
+ */
+ @NotNull
+ org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
// Paper end
}
2024-07-15 23:35:51 +02:00
diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
2024-12-03 17:58:41 +01:00
index 5d2597378d36ccace672db0768267d3499100cf1..361db256296d776c27e601c923b2cdc61967122b 100644
2024-07-15 23:35:51 +02:00
--- 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
/**
2024-07-18 10:13:20 +02:00
* When a creature is spawned by a potion effect, for example:
* {@link org.bukkit.potion.PotionType#OOZING}, {@link org.bukkit.potion.PotionType#INFESTED}