From 4254827b2cadd253c694244b00c458122c96e9d3 Mon Sep 17 00:00:00 2001 From: Grimdhex <176165533+Grimdhex@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:05:12 +0200 Subject: [PATCH] Revert "chore(Debug/Scripting): improve debug errors during the unloading scripts (#19643)" (#19951) This reverts commit db7183a5737646773a2f240f01b5891c1e4a4fe8. *wrongly use to catch sigsegv *null check isn't necessary: https://en.cppreference.com/w/cpp/memory/new/operator_delete --- src/server/game/Scripting/ScriptMgr.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d97e568bf..9ec3ffeea 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -30,24 +30,9 @@ namespace template inline void SCR_CLEAR() { - for (auto& [scriptID, script] : ScriptRegistry::ScriptPointerList) + for (auto const& [scriptID, script] : ScriptRegistry::ScriptPointerList) { - try - { - if(script) - { - delete script; - script = nullptr; - } - } - catch (const std::exception& e) - { - LOG_ERROR("scripts.unloading", "Failed to unload script {} with ID: {}. Error: {}", script->GetName(), scriptID, e.what()); - } - catch (...) - { - LOG_ERROR("scripts.unloading", "Failed to unload script {} with ID: {}. Unknown error occurred.", script->GetName(), scriptID); - } + delete script; } ScriptRegistry::ScriptPointerList.clear();