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

Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
This commit is contained in:
Vincent-Michael
2014-06-22 00:58:08 +02:00
8 changed files with 8206 additions and 8 deletions

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)