From 2fe9fed7c71697af06b981e221ea54acb62abb6b Mon Sep 17 00:00:00 2001
From: XTZGZoReX <none@none>
Date: Tue, 7 Apr 2009 10:51:45 +0200
Subject: * Tabs to spaces -- using: perl -p -i -e "s/\t/    /g" *

--HG--
branch : trunk
---
 src/game/Player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/game/Player.cpp')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index f29b81c11f4..e24c2331345 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -15524,7 +15524,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
             missingItem = ar->item2;
 
         uint32 missingKey = 0;
-		uint32 missingHeroicQuest = 0;
+        uint32 missingHeroicQuest = 0;
         if(GetDifficulty() == DIFFICULTY_HEROIC)
         {
             if(ar->heroicKey)
@@ -15536,7 +15536,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
             else if(ar->heroicKey2 && !HasItemCount(ar->heroicKey2, 1))
                 missingKey = ar->heroicKey2;
 
-			if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest))
+            if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest))
                 missingHeroicQuest = ar->heroicQuest;
         }
 
-- 
cgit v1.2.3


From 6f3efad8991238d2b4f68b26dced47ae5b2e0bc8 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
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/game/Player.cpp')

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