Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
This commit is contained in:
Vincent-Michael committed 2014-06-22 00:58:08 +02:00
2 parents ec49d510fc ac343c72cc
commit e5606c6f6f
8 files changed
+8206 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Scripting/ScriptMgr.cpp
+2 -2
View File
@@ -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)