From 272addbf2bd53b0cf6856d4bf81c9558079cce82 Mon Sep 17 00:00:00 2001 From: Seyden Date: Tue, 15 Feb 2022 22:36:48 +0100 Subject: Core/Scripts: Fix Hotswap not reinitializing AIs after destroying them and then crashing due to AI being nullptr (#27744) --- src/server/game/Scripting/ScriptMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); } }; -- cgit v1.2.3