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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
This commit is contained in:
Vincent-Michael committed 2014-07-12 18:08:30 +02:00
commit 0f5c481cd4
14 files changed
+217 -186

No files matched your search

@@ -1094,7 +1094,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
// Apply at_login requests
if (pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
{
pCurrChar->resetSpells();
pCurrChar->ResetSpells();
SendNotification(LANG_RESET_SPELLS);
}