diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-22 00:58:08 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-22 00:58:08 +0200 |
| commit | e5606c6f6f49a7adca719d6f70475743fce76919 (patch) | |
| tree | 5c563e3dd1fd390fe46ede72cc1596b6a9f4c623 /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | ec49d510fc1ba0eb902ab38ba76388ffc99b935c (diff) | |
| parent | ac343c72cc954b7af78ab131811fc8e73907efef (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d99975e72d8..82189485ee6 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1242,9 +1242,9 @@ void ScriptMgr::OnPlayerSpellCast(Player* player, Spell* spell, bool skipCheck) FOREACH_SCRIPT(PlayerScript)->OnSpellCast(player, spell, skipCheck); } -void ScriptMgr::OnPlayerLogin(Player* player) +void ScriptMgr::OnPlayerLogin(Player* player, bool firstLogin) { - FOREACH_SCRIPT(PlayerScript)->OnLogin(player); + FOREACH_SCRIPT(PlayerScript)->OnLogin(player, firstLogin); } void ScriptMgr::OnPlayerLogout(Player* player) |