mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Fix finalizeSpawn's return value not being used correctly. Closes #9964
This commit is contained in:
2 files changed
+11
-2
No files matched your search
@@ -75,6 +75,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -738,6 +_,7 @@
|
||||
p_8648_.tickCount++;
|
||||
this.getProfiler().push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(p_8648_.getType()).toString());
|
||||
profilerfiller.incrementCounter("tickNonPassenger");
|
||||
+ if (p_8648_.canUpdate())
|
||||
p_8648_.tick();
|
||||
this.getProfiler().pop();
|
||||
|
||||
@@ -755,6 +_,7 @@
|
||||
ProfilerFiller profilerfiller = this.getProfiler();
|
||||
profilerfiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(p_8664_.getType()).toString());
|
||||
|
||||
@@ -347,9 +347,9 @@ public final class ForgeEventFactory {
|
||||
boolean cancel = post(event);
|
||||
|
||||
if (!cancel)
|
||||
mob.finalizeSpawn(level, event.getDifficulty(), event.getSpawnType(), event.getSpawnData());
|
||||
return mob.finalizeSpawn(level, event.getDifficulty(), event.getSpawnType(), event.getSpawnData());
|
||||
|
||||
return cancel ? null : event.getSpawnData();
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -840,6 +840,7 @@ public final class ForgeEventFactory {
|
||||
LevelEvent.PotentialSpawns event = new LevelEvent.PotentialSpawns(level, category, pos, oldList);
|
||||
if (post(event))
|
||||
return WeightedRandomList.create();
|
||||
//System.out.println("List: " + oldList.unwrap() + " " + event.getSpawnerDataList());
|
||||
return WeightedRandomList.create(event.getSpawnerDataList());
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user