diff options
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_debug.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_instance.cpp | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 6213da831ee..c29b54739d9 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1219,15 +1219,17 @@ public: if (!mEntry || !mEntry->IsRaid()) return false; int32 difficulty = difficulty_str ? atoi(difficulty_str) : -1; - if (difficulty >= MAX_DIFFICULTY || difficulty < -1) + if (!sDifficultyStore.HasRecord(difficulty) || difficulty < -1) return false; if (difficulty == -1) - for (uint8 diff = 0; diff < MAX_DIFFICULTY; ++diff) + { + for (DifficultyEntry const* difficulty : sDifficultyStore) { - if (sDB2Manager.GetMapDifficultyData(map, Difficulty(diff))) - sInstanceSaveMgr->ForceGlobalReset(map, Difficulty(diff)); + if (sDB2Manager.GetMapDifficultyData(map, Difficulty(difficulty->ID))) + sInstanceSaveMgr->ForceGlobalReset(map, Difficulty(difficulty->ID)); } + } else sInstanceSaveMgr->ForceGlobalReset(map, Difficulty(difficulty)); return true; diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index d4574bf1a21..c65fb50a0a7 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "DB2Stores.h" #include "Group.h" #include "InstanceSaveMgr.h" #include "InstanceScript.h" @@ -79,9 +80,9 @@ public: player = handler->GetSession()->GetPlayer(); uint32 counter = 0; - for (uint8 i = 0; i < MAX_DIFFICULTY; ++i) + for (DifficultyEntry const* difficulty : sDifficultyStore) { - auto binds = player->GetBoundInstances(Difficulty(i)); + auto binds = player->GetBoundInstances(Difficulty(difficulty->ID)); if (binds != player->m_boundInstances.end()) { for (auto itr = binds->second.begin(); itr != binds->second.end(); ++itr) @@ -98,9 +99,9 @@ public: counter = 0; if (Group* group = player->GetGroup()) { - for (uint8 i = 0; i < MAX_DIFFICULTY; ++i) + for (DifficultyEntry const* difficulty : sDifficultyStore) { - auto binds = group->GetBoundInstances(Difficulty(i)); + auto binds = group->GetBoundInstances(Difficulty(difficulty->ID)); if (binds != group->GetBoundInstanceEnd()) { for (auto itr = binds->second.begin(); itr != binds->second.end(); ++itr) @@ -142,9 +143,9 @@ public: return false; } - for (uint8 i = 0; i < MAX_DIFFICULTY; ++i) + for (DifficultyEntry const* difficulty : sDifficultyStore) { - auto binds = player->GetBoundInstances(Difficulty(i)); + auto binds = player->GetBoundInstances(Difficulty(difficulty->ID)); if (binds != player->m_boundInstances.end()) { for (auto itr = binds->second.begin(); itr != binds->second.end();) |