From 6f3efad8991238d2b4f68b26dced47ae5b2e0bc8 Mon Sep 17 00:00:00 2001 From: megamage Date: Tue, 7 Apr 2009 11:24:51 -0500 Subject: *Fix a 100% crash caused by duel. --HG-- branch : trunk --- src/game/Player.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/game/Player.cpp b/src/game/Player.cpp index e24c2331345..2eeb5d3548c 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6273,6 +6273,8 @@ void Player::DuelComplete(DuelCompleteType type) if(!duel) return; + sLog.outDebug("Dual Complete %s %s", GetName(), duel->opponent->GetName()); + WorldPacket data(SMSG_DUEL_COMPLETE, (1)); data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0); GetSession()->SendPacket(&data); @@ -6309,8 +6311,8 @@ void Player::DuelComplete(DuelCompleteType type) duel->initiator->RemoveGameObject(obj,true); /* remove auras */ - AuraMap & vAuras = duel->opponent->GetAuras(); - for(AuraMap::iterator i = vAuras.begin(); i != vAuras.end();) + AuraMap &itsAuras = duel->opponent->GetAuras(); + for(AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end();) { if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) { @@ -6320,8 +6322,8 @@ void Player::DuelComplete(DuelCompleteType type) ++i; } - vAuras = GetAuras(); - for(AuraMap::iterator i = vAuras.begin(); i != vAuras.end();) + AuraMap &myAuras = GetAuras(); + for(AuraMap::iterator i = myAuras.begin(); i != myAuras.end();) { if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) { -- cgit v1.2.3