diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-01 22:20:33 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-01 22:20:33 +0100 |
| commit | ffe8c75f17aa4c4059771265dd408055cb3c4e52 (patch) | |
| tree | 94cadbcea5b6f69224550a24f2b5a9791f17447d /src/server/game/Spells/SpellEffects.cpp | |
| parent | a8d514914be2e88dbae5013a17013adabefcfe74 (diff) | |
| parent | a7dd289b04e3a9d0337fb5b6db3fc7a70f670933 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 119e828680d..3637bb18049 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -277,6 +277,10 @@ void Spell::EffectInstaKill(SpellEffIndex /*effIndex*/) if (!unitTarget || !unitTarget->isAlive()) return; + if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->ToPlayer()->GetCommandStatus(CHEAT_GOD)) + return; + if (m_caster == unitTarget) // prevent interrupt message finish(); |