diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-26 18:22:06 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-26 18:22:06 +0100 |
| commit | 7cc482855421a6d6cc02c5ed9148cfde543ba8d6 (patch) | |
| tree | ed54bedb7e9d0c88fa9d4326426eb1f4aef786ce /src/server/game/Handlers/SkillHandler.cpp | |
| parent | bdc150ebbd06e5f83b893d3771677f2e670c87d5 (diff) | |
| parent | 79a2a0c434d24c7bf65a0625fad9dfe87533e2fd (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/Unit/Unit.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warrior.cpp
Diffstat (limited to 'src/server/game/Handlers/SkillHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/SkillHandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp index 72587fec552..2108b654d6b 100644 --- a/src/server/game/Handlers/SkillHandler.cpp +++ b/src/server/game/Handlers/SkillHandler.cpp @@ -88,6 +88,9 @@ void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket& recvData) return; } + if (!unit->isCanTrainingAndResetTalentsOf(_player)) + return; + // remove fake death if (GetPlayer()->HasUnitState(UNIT_STATE_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); |