diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-12 18:08:30 +0200 | 
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-12 18:08:30 +0200 | 
| commit | 0f5c481cd44a0f26c3decf286f23801e6df4b838 (patch) | |
| tree | bc9ec876394a50f10f048bb935e3d76e07eed611 /src/server/game/Handlers/CharacterHandler.cpp | |
| parent | 3f0ce25d5d3b90102a77f8b6d0b942d84fec7cfa (diff) | |
| parent | 6d8dbb5c4a638d4a76a8d0901f168a5b91658ccd (diff) | |
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
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 31e46d5abc8..dd4d9c9bc9f 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -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);      }  | 
