From c22fbc08d70aae7d7fdd54e3029b5bb403bad944 Mon Sep 17 00:00:00 2001 From: Nivomi Date: Thu, 2 Oct 2025 18:47:48 -0400 Subject: [PATCH] Fix "SpawnActor::CanBeApplied" check which would also actually spawn the actor, thus causing two actors two be spawned (also fix for WithOffset) (#5822) --- .../game-interactor/GameInteractionEffect.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp index 76e026206..682a1271e 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp @@ -632,10 +632,10 @@ void SlipperyFloor::_Remove() { // MARK: - SpawnEnemyWithOffset GameInteractionEffectQueryResult SpawnEnemyWithOffset::CanBeApplied() { - if (!GameInteractor::IsSaveLoaded(true)) { + if (!GameInteractor::CanSpawnActor()) { return GameInteractionEffectQueryResult::TemporarilyNotPossible; } - return GameInteractor::RawAction::SpawnEnemyWithOffset(parameters[0], parameters[1]); + return GameInteractionEffectQueryResult::Possible; } void SpawnEnemyWithOffset::_Apply() { @@ -644,10 +644,10 @@ void SpawnEnemyWithOffset::_Apply() { // MARK: - SpawnActor GameInteractionEffectQueryResult SpawnActor::CanBeApplied() { - if (!GameInteractor::IsSaveLoaded(true)) { + if (!GameInteractor::CanSpawnActor()) { return GameInteractionEffectQueryResult::TemporarilyNotPossible; } - return GameInteractor::RawAction::SpawnActor(parameters[0], parameters[1]); + return GameInteractionEffectQueryResult::Possible; } void SpawnActor::_Apply() {