mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 04:09:51 +00:00
Fix canceling MobSpawnEvent.FinalizeSpawn causing a NPE closes #9971
This commit is contained in:
2 files changed
+4
-5
No files matched your search
@@ -10,10 +10,11 @@
|
||||
}
|
||||
|
||||
boolean flag1 = spawndata.getEntityToSpawn().size() == 1 && spawndata.getEntityToSpawn().contains("id", 8);
|
||||
- if (flag1) {
|
||||
- ((Mob)entity).finalizeSpawn(p_151312_, p_151312_.getCurrentDifficultyAt(entity.blockPosition()), MobSpawnType.SPAWNER, null);
|
||||
+ // Forge: Patch in FinalizeSpawn for spawners so it may be fired unconditionally, instead of only when vanilla normally would trigger it.
|
||||
+ var event = net.minecraftforge.event.ForgeEventFactory.onFinalizeSpawnSpawner(mob, p_151312_, p_151312_.getCurrentDifficultyAt(entity.blockPosition()), null, compoundtag, this);
|
||||
if (flag1) {
|
||||
- ((Mob)entity).finalizeSpawn(p_151312_, p_151312_.getCurrentDifficultyAt(entity.blockPosition()), MobSpawnType.SPAWNER, null);
|
||||
+ if (!event.isCanceled() && flag1) {
|
||||
+ ((Mob)entity).finalizeSpawn(p_151312_, event.getDifficulty(), MobSpawnType.SPAWNER, null);
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in new issue
Block a user