Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Battleground:

Browse Source 
Add missing NULL pointer check for player if is not in world

Core/Spell:
Add absolute value for delta because can be nevgative

Close #10846
This commit is contained in:
zorix
2013-09-20 16:58:27 +02:00
parent fb997c5f41
commit bd48d0ebe7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,9 @@ 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;
for (Battleground::BattlegroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr)
{
if (!bg->IsPlayerInBattleground(itr->first))
@@ -386,6 +388,12 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
}
Player* player = ObjectAccessor::FindPlayer(itr->first);
if (!player)
{
TC_LOG_ERROR(LOG_FILTER_BATTLEGROUND, "Player " UI64FMTD " has scoreboard entry for battleground %u but is not in world!", itr->first, bg->GetTypeID(true));
continue;
}
ObjectGuid playerGUID = itr->first;
BattlegroundScore* score = itr->second;
@@ -539,8 +547,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);
}