From 5443426369a78a8c595fd4bc02a563808fec3c50 Mon Sep 17 00:00:00 2001 From: Vincenzo Date: Tue, 4 Mar 2025 22:42:01 +0100 Subject: [PATCH 1/2] Add SpawnReason "Bucket". Fix "DEFAULT" SpawnReason for entity spawning from mob bucket --- .../org/bukkit/event/entity/CreatureSpawnEvent.java | 4 ++++ .../net/minecraft/world/item/MobBucketItem.java.patch | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 paper-server/patches/sources/net/minecraft/world/item/MobBucketItem.java.patch diff --git a/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java index 361db256296d..7fd26dd5f72c 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java @@ -211,6 +211,10 @@ public enum SpawnReason { * When an entity spawns from an ominous item spawner */ OMINOUS_ITEM_SPAWNER, + /** + * When an entity spawns from a mob bucket + */ + BUCKET, // Paper end - Fixes and additions to the SpawnReason API /** * When a creature is spawned by a potion effect, for example: diff --git a/paper-server/patches/sources/net/minecraft/world/item/MobBucketItem.java.patch b/paper-server/patches/sources/net/minecraft/world/item/MobBucketItem.java.patch new file mode 100644 index 000000000000..668262765cea --- /dev/null +++ b/paper-server/patches/sources/net/minecraft/world/item/MobBucketItem.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/item/MobBucketItem.java ++++ b/net/minecraft/world/item/MobBucketItem.java +@@ -58,7 +_,7 @@ + } + + if (mob != null) { +- serverLevel.addFreshEntityWithPassengers(mob); ++ serverLevel.addFreshEntityWithPassengers(mob, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BUCKET); // Paper - Add SpawnReason + mob.playAmbientSound(); + } + } From 92ddcd1d15bd28f5a6df55fe24f5e53528de9a38 Mon Sep 17 00:00:00 2001 From: Vincenzo Date: Wed, 5 Mar 2025 13:17:55 +0100 Subject: [PATCH 2/2] Clarify SpawnReason description for bucket entity spawning --- .../main/java/org/bukkit/event/entity/CreatureSpawnEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java index 7fd26dd5f72c..0c3f8f3f6ec7 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java @@ -212,7 +212,7 @@ public enum SpawnReason { */ OMINOUS_ITEM_SPAWNER, /** - * When an entity spawns from a mob bucket + * When an entity spawns from a bucket */ BUCKET, // Paper end - Fixes and additions to the SpawnReason API