From b34e2bdb1c988450d9737d7565f9d357edff4dc7 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Tue, 20 Apr 2010 03:30:27 +0200
Subject: Fix spellaura-crash Fixes #1767, closes #1772 (and the other ones
 already merged into it)

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index eddbb230b16..901adfd2443 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -558,9 +558,7 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
     Player * modOwner = NULL;
     if (caster)
     {
-        modOwner = caster->GetSpellModOwner();
-        modSpell = modOwner->FindCurrentSpellBySpellId(GetId());
-        if (modOwner && modSpell)
+        if ((modOwner = caster->GetSpellModOwner()) && (modSpell = modOwner->FindCurrentSpellBySpellId(GetId())))
             modOwner->SetSpellModTakingSpell(modSpell, true);
     }
 
-- 
cgit v1.2.3