diff options
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 6 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index ca7dc435b09..b3fd3723466 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -671,9 +671,15 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit) Map::PlayerList const &PlayerList = map->GetPlayers(); for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { if (Player* i_pl = i->getSource()) if (!i_pl->isAlive()) + { + pUnit->SetInCombatWith(i_pl); + i_pl->SetInCombatWith(pUnit); pUnit->AddThreat(i_pl, 0.0f); + } + } } void ScriptedAI::DoResetThreat() diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 56d8c415503..d7ed4f3af4c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -333,11 +333,11 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) damage = 200; break; } - // must only affect demons (also undead?) + // arcane charge. must only affect demons (also undead?) case 45072: { if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON - || unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD) + && unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD) return; break; } |