From a79b42bf681e211997923dbc6c191aae187aded6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 13 Mar 2024 18:51:29 +0100 Subject: Core/Misc: Use our new unique_trackable_ptr for various classes exposed to scripts (not actually used anywhere currently) (cherry picked from commit 4779fa5048642b57a0f69de7ab56b9d563c1cbc4) --- src/server/scripts/Commands/cs_guild.cpp | 4 +--- src/server/scripts/Commands/cs_learn.cpp | 4 ++-- src/server/scripts/Commands/cs_lookup.cpp | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index 73255185c67..bd3403fa40e 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -141,8 +141,6 @@ public: return false; targetGuild->Disband(); - delete targetGuild; - return true; } @@ -190,7 +188,7 @@ public: return false; CharacterDatabaseTransaction trans(nullptr); - targetGuild->DeleteMember(trans, targetGuid, false, true, true); + targetGuild->DeleteMember(trans, targetGuid, false, true); return true; } diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 57fe66a981f..2da6946a2e3 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -140,8 +140,8 @@ public: Player* player = handler->GetPlayer(); for (auto const& [id, quest] : sObjectMgr->GetQuestTemplates()) { - if (quest.GetRequiredClasses() && player->SatisfyQuestClass(&quest, false)) - player->LearnQuestRewardedSpells(&quest); + if (quest->GetRequiredClasses() && player->SatisfyQuestClass(quest.get(), false)) + player->LearnQuestRewardedSpells(quest.get()); } return true; } diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index b14bc9661c9..dfdbdc39586 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -710,7 +710,7 @@ public: } if (handler->GetSession()) - handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, questTemplatePair.first, questTemplatePair.first, questTemplatePair.second.GetQuestLevel(), title.c_str(), statusStr); + handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, questTemplatePair.first, questTemplatePair.first, questTemplatePair.second->GetQuestLevel(), title.c_str(), statusStr); else handler->PSendSysMessage(LANG_QUEST_LIST_CONSOLE, questTemplatePair.first, title.c_str(), statusStr); @@ -722,7 +722,7 @@ public: } } - std::string const& title = questTemplatePair.second.GetTitle(); + std::string const& title = questTemplatePair.second->GetTitle(); if (title.empty()) continue; @@ -755,7 +755,7 @@ public: } if (handler->GetSession()) - handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, questTemplatePair.first, questTemplatePair.first, questTemplatePair.second.GetQuestLevel(), title.c_str(), statusStr); + handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, questTemplatePair.first, questTemplatePair.first, questTemplatePair.second->GetQuestLevel(), title.c_str(), statusStr); else handler->PSendSysMessage(LANG_QUEST_LIST_CONSOLE, questTemplatePair.first, title.c_str(), statusStr); -- cgit v1.2.3