diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp index 9004fe4..27fe119 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineReplicator.cpp @@ -226,9 +226,10 @@ void ACogEngineReplicator::Server_DeleteActor_Implementation(AActor* Actor) void ACogEngineReplicator::Server_ApplyCheat_Implementation(const AActor* CheatInstigator, const TArray& Targets, const FCogEngineCheat& Cheat) const { if (Cheat.Execution == nullptr) - { - return; - } + { return; } + + if (GetWorld() == nullptr) + { return; } Cheat.Execution->Execute(GetWorld(), CheatInstigator, Targets); } @@ -236,6 +237,9 @@ void ACogEngineReplicator::Server_ApplyCheat_Implementation(const AActor* CheatI //-------------------------------------------------------------------------------------------------------------------------- ECogEngineCheat_ActiveState ACogEngineReplicator::IsCheatActiveOnTargets(const TArray& Targets, const FCogEngineCheat& Cheat) const { + if (GetWorld() == nullptr) + { return ECogEngineCheat_ActiveState::Inactive; } + if (Cheat.Execution == nullptr) { return ECogEngineCheat_ActiveState::Inactive; diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp index 6ef7b2f..85bf7ca 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp @@ -190,6 +190,7 @@ void FCogEngineWindow_Cheats::RenderContent() if (Replicator == nullptr) { ImGui::TextDisabled("No Replicator"); + return; } if (ImGui::BeginMenuBar())