Fix canceling MobSpawnEvent.FinalizeSpawn causing a NPE closes #9971

This commit is contained in:
LexManos committed 2024-05-11 23:05:19 -07:00
1 parent ddf76db9b3
commit 4b934809c4
2 files changed
+4 -5

No files matched your search

@@ -360,9 +360,7 @@ public final class ForgeEventFactory {
*/
@Nullable
public static MobSpawnEvent.FinalizeSpawn onFinalizeSpawnSpawner(Mob mob, ServerLevelAccessor level, DifficultyInstance difficulty, @Nullable SpawnGroupData spawnData, @Nullable CompoundTag spawnTag, BaseSpawner spawner) {
var event = new MobSpawnEvent.FinalizeSpawn(mob, level, mob.getX(), mob.getY(), mob.getZ(), difficulty, MobSpawnType.SPAWNER, spawnData, spawnTag, spawner);
boolean cancel = post(event);
return cancel ? null : event;
return fire(new MobSpawnEvent.FinalizeSpawn(mob, level, mob.getX(), mob.getY(), mob.getZ(), difficulty, MobSpawnType.SPAWNER, spawnData, spawnTag, spawner));
}
public static Result canEntityDespawn(Mob entity, ServerLevelAccessor level) {