aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting
diff options
context:
space:
mode:
authorSeyden <saiifii@live.de>2022-02-15 22:36:48 +0100
committerGitHub <noreply@github.com>2022-02-15 22:36:48 +0100
commit272addbf2bd53b0cf6856d4bf81c9558079cce82 (patch)
treec8ae6717be955cdab370bc7986694d0a943f3a8d /src/server/game/Scripting
parentc0748d4285e3f868e9331df45dd13828381d590d (diff)
Core/Scripts: Fix Hotswap not reinitializing AIs after destroying them and then crashing due to AI being nullptr (#27744)
Diffstat (limited to 'src/server/game/Scripting')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index cbec3f39834..b50f5a21642 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -554,7 +554,7 @@ class CreatureGameObjectAreaTriggerScriptRegistrySwapHooks
// When the script Id of the script isn't removed in this
// context change, do nothing.
uint32 aiId = object.second->AI() ? object.second->AI()->GetId() : 0;
- if (idsToRemove.find(aiId) != idsToRemove.end())
+ if (idsToRemove.find(aiId) != idsToRemove.end() || (aiId == 0 && object.second->GetScriptId()))
visitor(object.second);
}
};