Scripts/Commands: Add failure state for quest remove (#20611)

Add more verbose messaging to the .quest remove command

(cherry picked from commit 1cedcf0bf349581b6fff210e4c325e25b51ccf0c)

1 files changed, 27 insertions, 19 deletions

diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index fa6b1a0a0bd..a46c851cbe0 100644
--- a/src/server/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
@@ -131,33 +131,41 @@ public:
 
         QuestStatus oldStatus = player->GetQuestStatus(entry);
 
-        // remove all quest entries for 'entry' from quest log
-        for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+        if (player->GetQuestStatus(entry) != QUEST_STATUS_NONE)
         {
-            uint32 logQuest = player->GetQuestSlotQuestId(slot);
-            if (logQuest == entry)
+            // remove all quest entries for 'entry' from quest log
+            for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
             {
-                player->SetQuestSlot(slot, 0);
+                uint32 logQuest = player->GetQuestSlotQuestId(slot);
+                if (logQuest == entry)
+                {
+                    player->SetQuestSlot(slot, 0);
 
-                // we ignore unequippable quest items in this case, its' still be equipped
-                player->TakeQuestSourceItem(logQuest, false);
+                    // we ignore unequippable quest items in this case, its' still be equipped
+                    player->TakeQuestSourceItem(logQuest, false);
 
-                if (quest->HasFlag(QUEST_FLAGS_FLAGS_PVP))
-                {
-                    player->pvpInfo.IsHostile = player->pvpInfo.IsInHostileArea || player->HasPvPForcingQuest();
-                    player->UpdatePvPState();
+                    if (quest->HasFlag(QUEST_FLAGS_FLAGS_PVP))
+                    {
+                        player->pvpInfo.IsHostile = player->pvpInfo.IsInHostileArea || player->HasPvPForcingQuest();
+                        player->UpdatePvPState();
+                    }
                 }
             }
-        }
-
-        player->RemoveActiveQuest(entry, false);
-        player->RemoveRewardedQuest(entry);
+            player->RemoveActiveQuest(entry, false);
+            player->RemoveRewardedQuest(entry);
 
-        sScriptMgr->OnQuestStatusChange(player, entry);
-        sScriptMgr->OnQuestStatusChange(player, quest, oldStatus, QUEST_STATUS_NONE);
+            sScriptMgr->OnQuestStatusChange(player, entry);
+            sScriptMgr->OnQuestStatusChange(player, quest, oldStatus, QUEST_STATUS_NONE);
 
-        handler->SendSysMessage(LANG_COMMAND_QUEST_REMOVED);
-        return true;
+            handler->SendSysMessage(LANG_COMMAND_QUEST_REMOVED);
+            return true;
+        }
+        else
+        {
+            handler->SendSysMessage(LANG_COMMAND_QUEST_NOTFOUND);
+            handler->SetSentErrorMessage(true);
+            return false;
+        }
     }
 
     static bool HandleQuestComplete(ChatHandler* handler, char const* args)