diff options
| author | Subv <subv2112@gmail.com> | 2014-07-03 15:57:47 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-07-03 15:57:47 -0500 |
| commit | 151785b9ced2d6fa2d6c422fff7c53672c18ba98 (patch) | |
| tree | f41249f60a739f408ce226252d375ab04e65c8fd /src/server/game/Handlers/SkillHandler.cpp | |
| parent | 0a07fd5fc38f5b3beac187de88dcd26cb60d9f76 (diff) | |
| parent | 7b74a725c89cca383acab8a002c162fc7ff1e0ac (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
Conflicts:
src/server/game/World/World.cpp
Diffstat (limited to 'src/server/game/Handlers/SkillHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/SkillHandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp index f90dfef2684..8a94753b692 100644 --- a/src/server/game/Handlers/SkillHandler.cpp +++ b/src/server/game/Handlers/SkillHandler.cpp @@ -98,7 +98,8 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket& recvData) uint32 skillId; recvData >> skillId; - if (!IsPrimaryProfessionSkill(skillId)) + SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skillId, GetPlayer()->getRace(), GetPlayer()->getClass()); + if (!rcEntry || !(rcEntry->Flags & SKILL_FLAG_UNLEARNABLE)) return; GetPlayer()->SetSkill(skillId, 0, 0, 0); |