From be0055d2a0c2d63b96e97c5d2539bad464b43630 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Wed, 19 Jun 2024 19:18:47 +1000 Subject: [PATCH] #1429: Add CreatureSpawnEvent.SpawnReason#TRIAL_SPAWNER By: Doc --- .../entity/trialspawner/TrialSpawner.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 paper-server/nms-patches/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.patch diff --git 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 new file mode 100644 index 0000000000..82527bb9c6 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.patch @@ -0,0 +1,18 @@ +--- a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java ++++ b/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java +@@ -219,13 +219,13 @@ + } + + entityinsentient.setPersistenceRequired(); +- Optional optional1 = mobspawnerdata.getEquipment(); ++ Optional optional1 = mobspawnerdata.getEquipment(); // CraftBukkit - decompile error + + Objects.requireNonNull(entityinsentient); + optional1.ifPresent(entityinsentient::equip); + } + +- if (!worldserver.tryAddFreshEntityWithPassengers(entity)) { ++ if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRIAL_SPAWNER)) { // CraftBukkit + return Optional.empty(); + } else { + TrialSpawner.a trialspawner_a = this.isOminous ? TrialSpawner.a.OMINOUS : TrialSpawner.a.NORMAL;