diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2017-08-22 21:24:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-23 16:06:43 +0200 |
| commit | ae4dacfd1d9382c40b68b8568d39cffdd14edc72 (patch) | |
| tree | 4e731e409aadbee27d67a8a5bec415e9ad30fb75 /src | |
| parent | d361de0c271a40287d79a60a0928bcd3e6718c44 (diff) | |
Core/Scripts: FOR_SCRIPTS macro shouldn't return early (#20187)
FOR_SCRIPTS, insteadof FOR_SCRIPTS_RET, shouldn't return
otherwise methods such as void ScriptMgr::OnPlayerEnterMap(Map* map, Player* player) will end prematurely
(cherry picked from commit 4ee16fb536177cdedcb435a59cb625490f5ec69f)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 531900b8141..f6f26e457f2 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1072,11 +1072,9 @@ private: // Utility macros for looping over scripts. #define FOR_SCRIPTS(T, C, E) \ - if (SCR_REG_LST(T).empty()) \ - return; \ - \ - for (SCR_REG_ITR(T) C = SCR_REG_LST(T).begin(); \ - C != SCR_REG_LST(T).end(); ++C) + if (!SCR_REG_LST(T).empty()) \ + for (SCR_REG_ITR(T) C = SCR_REG_LST(T).begin(); \ + C != SCR_REG_LST(T).end(); ++C) #define FOR_SCRIPTS_RET(T, C, E, R) \ if (SCR_REG_LST(T).empty()) \ |