aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-05 23:03:04 -0600
committermegamage <none@none>2009-02-05 23:03:04 -0600
commitbb190b285984e6a507c6a94d2a3664e3828c81af (patch)
tree0118a2a05bfaae93f01b38a7ceda2328e0744ab0 /src
parent036c6eb7422e9b7edd0e9d06ab2d61afe535e016 (diff)
Fixed phase seelction for gameobject/creature spawn for GM-mode without phase auras. Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index b66df6ce197..d992bfd4a65 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -20370,9 +20370,7 @@ uint32 Player::GetPhaseMaskForSpawn() const
else
{
AuraList const& phases = GetAurasByType(SPELL_AURA_PHASE);
- if(phases.empty())
- phase = GetPhaseMask();
- else
+ if(!phases.empty())
phase = phases.front()->GetMiscValue();
}
@@ -20381,4 +20379,4 @@ uint32 Player::GetPhaseMaskForSpawn() const
return n_phase;
return PHASEMASK_NORMAL;
-} \ No newline at end of file
+}