aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api')
-rw-r--r--patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch (renamed from patches/api/0165-Entity-getEntitySpawnReason.patch)25
1 files changed, 22 insertions, 3 deletions
diff --git a/patches/api/0165-Entity-getEntitySpawnReason.patch b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
index 3b9f0bedd1..703394db19 100644
--- a/patches/api/0165-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch
@@ -1,15 +1,17 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Sun, 24 Mar 2019 00:21:23 -0400
-Subject: [PATCH] Entity#getEntitySpawnReason
-
-Allows you to return the SpawnReason for why an Entity Spawned
+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
@@ -27,3 +29,20 @@ index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae25
+ 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
+ */