Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10888 from zorix/PR4

Browse Source 
Core/Battleground:
This commit is contained in:
Discover-
2014-01-21 21:14:49 -08:00
parent 3f99890b12 7c721506a9
commit 77031c59fb
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Battlegrounds/Battleground.cpp
View File

@@ -1181,10 +1181,12 @@ void Battleground::AddPlayer(Player* player)
uint64 guid = player->GetGUID();
uint32 team = player->GetBGTeam();
int32 primaryTree = player->GetPrimaryTalentTree(player->GetActiveSpec());
BattlegroundPlayer bp;
bp.OfflineRemoveTime = 0;
bp.Team = team;
bp.PrimaryTree = primaryTree;
// Add to list/maps
m_Players[guid] = bp;

1
src/server/game/Battlegrounds/Battleground.h
View File

@@ -160,6 +160,7 @@ struct BattlegroundPlayer
{
time_t OfflineRemoveTime; // for tracking and removing offline players from queue after 5 minutes
uint32 Team; // Player's team
int32 PrimaryTree; // Player's primary tree
};
struct BattlegroundObjectInfo

32
src/server/game/Battlegrounds/BattlegroundMgr.cpp
View File

@@ -376,7 +376,10 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
}
}
data->WriteBits(bg->GetPlayerScoresSize(), 21);
size_t count_pos = data->bitwpos();
data->WriteBits(0, 21);
uint32 count = 0;
BattlegroundPlayerMap const& bgPlayers = bg->GetPlayers();
for (Battleground::BattlegroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr)
{
if (!bg->IsPlayerInBattleground(itr->first))
@@ -385,7 +388,26 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
continue;
}
Player* player = ObjectAccessor::FindPlayer(itr->first);
uint32 team;
int32 primaryTree;
if (Player* player = ObjectAccessor::FindPlayer(itr->first))
{
team = player->GetBGTeam();
primaryTree = player->GetPrimaryTalentTree(player->GetActiveSpec());
}
else
{
BattlegroundPlayerMap::const_iterator itr2 = bgPlayers.find(itr->first);
if (itr2 == bgPlayers.end())
{
TC_LOG_ERROR(LOG_FILTER_BATTLEGROUND, "Player " UI64FMTD " has scoreboard entry for battleground %u but do not have battleground data!", itr->first, bg->GetTypeID(true));
continue;
}
team = itr2->second.Team;
primaryTree = itr2->second.PrimaryTree;
}
ObjectGuid playerGUID = itr->first;
BattlegroundScore* score = itr->second;
@@ -401,7 +423,7 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
data->WriteBit(playerGUID[5]);
data->WriteBit(playerGUID[1]);
data->WriteBit(playerGUID[6]);
data->WriteBit(player->GetBGTeam() == HORDE ? 0 : 1);
data->WriteBit(team == HORDE ? 0 : 1);
data->WriteBit(playerGUID[7]);
buff << uint32(score->HealingDone); // healing done
@@ -423,7 +445,7 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
buff.WriteByteSeq(playerGUID[1]);
buff.WriteByteSeq(playerGUID[6]);
buff << int32(player->GetPrimaryTalentTree(player->GetActiveSpec()));
buff << int32(primaryTree);
switch (bg->GetTypeID(true)) // Custom values
{
@@ -539,8 +561,10 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
// if (unk 4) << uint32() unk
buff.WriteByteSeq(playerGUID[7]);
buff.WriteByteSeq(playerGUID[2]);
++count;
}
data->PutBits(count_pos, count, 21);
data->WriteBit(bg->GetStatus() == STATUS_WAIT_LEAVE); // If Ended
if (isRated) // arena

2
src/server/game/Spells/SpellInfo.cpp
View File

@@ -452,7 +452,7 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster, int32 const* bp, Unit const
float preciseBasePoints = ScalingMultiplier * multiplier;
if (DeltaScalingMultiplier)
{
float delta = DeltaScalingMultiplier * ScalingMultiplier * multiplier * 0.5f;
float delta = fabs(DeltaScalingMultiplier * ScalingMultiplier * multiplier * 0.5f);
preciseBasePoints += frand(-delta, delta);
}