Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Server/WorldSession.cpp
This commit is contained in:
commit
1e4ec81ccb
4 files changed
+18
-4
No files matched your search
@@ -874,7 +874,10 @@ void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket& recvData)
|
||||
|
||||
uint32 talentId, talentRank;
|
||||
|
||||
for (uint32 i = 0; i < talentsCount; ++i)
|
||||
// Client has max 19 talents, rounded up : 25
|
||||
uint32 const MaxTalentsCount = 25;
|
||||
|
||||
for (uint32 i = 0; i < talentsCount && i < MaxTalentsCount; ++i)
|
||||
{
|
||||
recvData >> talentId >> talentRank;
|
||||
|
||||
@@ -882,4 +885,6 @@ void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket& recvData)
|
||||
}
|
||||
|
||||
_player->SendTalentsInfoData(true);
|
||||
|
||||
recvData.rfinish();
|
||||
}
|
||||
Reference in new issue
Block a user