aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclick <none@none>2010-04-20 03:30:27 +0200
committerclick <none@none>2010-04-20 03:30:27 +0200
commitb34e2bdb1c988450d9737d7565f9d357edff4dc7 (patch)
tree1b757a68315b00d1b6d4ea1303f65161b94db2a7
parenta5500fd7f1df88e1a23c9b250ec0568cdd4d9c02 (diff)
Fix spellaura-crash
Fixes #1767, closes #1772 (and the other ones already merged into it) --HG-- branch : trunk
-rw-r--r--src/game/SpellAuras.cpp4
1 files changed, 1 insertions, 3 deletions
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);
}