josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wintergrasp: Fix tenacity calculation, by rammbonr5. Closes #156

Browse Source 
Wintergrasp: Safe check to avoid crash, by Spp. Closes #188

--HG--
branch : trunk
This commit is contained in:
tartalo
2009-11-11 13:45:10 +01:00
parent bbe7de48b8
commit 558e334c33
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Wintergrasp.cpp
+7 -4
View File
@@ -977,8 +977,11 @@ bool OPvPWintergrasp::UpdateQuestGiverPosition(uint32 guid, Creature *creature)
creature->GetPositionZ() == pos.GetPositionZ()) creature->GetPositionZ() == pos.GetPositionZ())
return false; return false;
creature->CombatStop(true); if (creature->isInCombat())
creature->getHostilRefManager().deleteReferences(); {
creature->CombatStop(true);
creature->getHostilRefManager().deleteReferences();
}
creature->SetHomePosition(pos); creature->SetHomePosition(pos);
creature->DestroyForNearbyPlayers(); creature->DestroyForNearbyPlayers();
if (!creature->GetMap()->IsLoaded(pos.GetPositionX(), pos.GetPositionY())) if (!creature->GetMap()->IsLoaded(pos.GetPositionX(), pos.GetPositionY()))
@@ -1252,9 +1255,9 @@ void OPvPWintergrasp::UpdateTenacityStack()
if (allianceNum && hordeNum) if (allianceNum && hordeNum)
{ {
if (allianceNum < hordeNum) if (allianceNum < hordeNum)
newStack = (hordeNum / allianceNum - 1)*4; // positive, should cast on alliance newStack = int32((hordeNum / (float)allianceNum - 1)*4); // positive, should cast on alliance
else if (allianceNum > hordeNum) else if (allianceNum > hordeNum)
newStack = (1 - int32(allianceNum / hordeNum))*4; // negative, should cast on horde newStack = int32((1 - allianceNum / (float)hordeNum)*4); // negative, should cast on horde
} }
if (newStack == m_tenacityStack) if (newStack == m_tenacityStack)