Merge pull request #8527 from Warpten/miscSpell

Core/Spells: Multiple changes

2 files changed, 4 insertions, 3 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 170582755b3..ee9b63eb364 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -17337,7 +17337,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
         uint32 talentTree = atol(talentTrees[i]);
         if (sTalentTabStore.LookupEntry(talentTree))
             SetPrimaryTalentTree(i, talentTree);
-        else if (i == GetActiveSpec())
+        else if (i == GetActiveSpec() && talentTree != 0)
             SetAtLoginFlag(AT_LOGIN_RESET_TALENTS); // invalid tree, reset talents
     }
 
diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp
index 22f8513870c..8a2f9d9d39a 100644
--- a/src/server/game/Handlers/GuildHandler.cpp
+++ b/src/server/game/Handlers/GuildHandler.cpp
@@ -816,8 +816,9 @@ void WorldSession::HandleGuildNewsUpdateStickyOpcode(WorldPacket& recvPacket)
 
 void WorldSession::HandleGuildSetGuildMaster(WorldPacket& recvPacket)
 {
-    uint8 nameLength;
-    recvPacket >> nameLength;
+    uint8 nameLength = recvPacket.ReadBits(7);
+    // This is related to guild master inactivity.
+    /*bool isDethrone = */recvPacket.ReadBit();
     std::string playerName = recvPacket.ReadString(nameLength);
     if (Guild* guild = GetPlayer()->GetGuild())
         guild->HandleSetNewGuildMaster(this, playerName);