Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp

1 files changed, 4 insertions, 0 deletions

diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp
index f2199e26055..9d93c7af182 100755
--- a/src/server/game/Handlers/SkillHandler.cpp
+++ b/src/server/game/Handlers/SkillHandler.cpp
@@ -108,5 +108,9 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket& recvData)
 {
     uint32 skillId;
     recvData >> skillId;
+
+    if (!IsPrimaryProfessionSkill(skillId))
+        return;
+
     GetPlayer()->SetSkill(skillId, 0, 0, 0);
 }