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

*Fix a 100% crash caused by duel.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-07 11:24:51 -05:00
parent c4f76b922d
commit 6f3efad899
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+6 -4
View File
@@ -6273,6 +6273,8 @@ void Player::DuelComplete(DuelCompleteType type)
if(!duel) if(!duel)
return; return;
sLog.outDebug("Dual Complete %s %s", GetName(), duel->opponent->GetName());
WorldPacket data(SMSG_DUEL_COMPLETE, (1)); WorldPacket data(SMSG_DUEL_COMPLETE, (1));
data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0); data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0);
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
@@ -6309,8 +6311,8 @@ void Player::DuelComplete(DuelCompleteType type)
duel->initiator->RemoveGameObject(obj,true); duel->initiator->RemoveGameObject(obj,true);
/* remove auras */ /* remove auras */
AuraMap & vAuras = duel->opponent->GetAuras(); AuraMap &itsAuras = duel->opponent->GetAuras();
for(AuraMap::iterator i = vAuras.begin(); i != vAuras.end();) for(AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end();)
{ {
if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime)
{ {
@@ -6320,8 +6322,8 @@ void Player::DuelComplete(DuelCompleteType type)
++i; ++i;
} }
vAuras = GetAuras(); AuraMap &myAuras = GetAuras();
for(AuraMap::iterator i = vAuras.begin(); i != vAuras.end();) for(AuraMap::iterator i = myAuras.begin(); i != myAuras.end();)
{ {
if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime)
{ {