Merge branch master into boost
Conflicts:
BattlegroundMgr.h
This commit is contained in:
1 parent
f14399d788
commit
dfdc19f3bc
84 files changed
+2009
-890
No files matched your search
@@ -165,7 +165,7 @@ public:
|
||||
|
||||
if (target)
|
||||
{
|
||||
target->resetSpells(/* bool myClassOnly */);
|
||||
target->ResetSpells(/* bool myClassOnly */);
|
||||
|
||||
ChatHandler(target->GetSession()).SendSysMessage(LANG_RESET_SPELLS);
|
||||
if (!handler->GetSession() || handler->GetSession()->GetPlayer() != target)
|
||||
@@ -233,7 +233,7 @@ public:
|
||||
|
||||
if (target)
|
||||
{
|
||||
target->resetTalents(true);
|
||||
target->ResetTalents(true);
|
||||
target->SendTalentsInfoData(false);
|
||||
ChatHandler(target->GetSession()).SendSysMessage(LANG_RESET_TALENTS);
|
||||
if (!handler->GetSession() || handler->GetSession()->GetPlayer() != target)
|
||||
|
||||
Reference in new issue
Block a user