Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/scripts/Commands/cs_misc.cpp src/server/worldserver/worldserver.conf.dist
This commit is contained in:
commit
2e1de60593
20 files changed
+476
-243
No files matched your search
@@ -295,6 +295,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();
|
||||
|
||||
|
||||
Reference in new issue
Block a user