#1429: Implement TrialSpawnerSpawnEvent

By: Doc <nachito94@msn.com>
2024-06-28 07:06:36 +10:00
parent 820bc6423d
commit 5f8cff3bb5
2 changed files with 23 additions and 2 deletions
--- a/paper-server/nms-patches/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.patch
+++ b/paper-server/nms-patches/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.patch
@@ -22,7 +22,7 @@
 
     public Codec<TrialSpawner> codec() {
         return RecordCodecBuilder.create((instance) -> {
-@@ -219,13 +219,13 @@
+@@ -219,13 +219,18 @@
                                 }
 
                                 entityinsentient.setPersistenceRequired();
@@ -34,7 +34,12 @@
                             }
 
 -                            if (!worldserver.tryAddFreshEntityWithPassengers(entity)) {
-+                            if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRIAL_SPAWNER)) { // CraftBukkit
+                            // CraftBukkit start
+                            if (org.bukkit.craftbukkit.event.CraftEventFactory.callTrialSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
+                                return Optional.empty();
+                            }
+                            if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRIAL_SPAWNER)) {
+                                // CraftBukkit end
                                 return Optional.empty();
                             } else {
                                 TrialSpawner.a trialspawner_a = this.isOminous ? TrialSpawner.a.OMINOUS : TrialSpawner.a.NORMAL;