diff options
Diffstat (limited to 'src/scripts/Spells')
| -rw-r--r-- | src/scripts/Spells/spell_dk.cpp | 5 | ||||
| -rw-r--r-- | src/scripts/Spells/spell_item.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/scripts/Spells/spell_dk.cpp b/src/scripts/Spells/spell_dk.cpp index 7df04d3a18..56af220e42 100644 --- a/src/scripts/Spells/spell_dk.cpp +++ b/src/scripts/Spells/spell_dk.cpp @@ -260,7 +260,7 @@ class spell_dk_raise_ally_trigger : public SpellScriptLoader void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* charm = GetUnitOwner()->GetCharm()) - if (charm->GetEntry() == GetSpellInfo()->Effects[EFFECT_0].MiscValue) + if (GetSpellInfo()->Effects[EFFECT_0].MiscValue >= 0 && charm->GetEntry() == uint32(GetSpellInfo()->Effects[EFFECT_0].MiscValue)) charm->ToCreature()->DespawnOrUnsummon(); } @@ -782,7 +782,7 @@ class spell_dk_dancing_rune_weapon : public SpellScriptLoader Unit* target = eventInfo.GetActionTarget(); Unit* dancingRuneWeapon = NULL; for (Unit::ControlSet::const_iterator itr = player->m_Controlled.begin(); itr != player->m_Controlled.end(); ++itr) - if ((*itr)->GetEntry() == GetSpellInfo()->Effects[EFFECT_0].MiscValue) + if (int32((*itr)->GetEntry()) == GetSpellInfo()->Effects[EFFECT_0].MiscValue) { dancingRuneWeapon = *itr; break; @@ -1569,7 +1569,6 @@ class spell_dk_death_grip : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - int32 damage = GetEffectValue(); float casterZ = GetCaster()->GetPositionZ(); // for Ring of Valor WorldLocation gripPos = *GetExplTargetDest(); if (Unit* target = GetHitUnit()) diff --git a/src/scripts/Spells/spell_item.cpp b/src/scripts/Spells/spell_item.cpp index 289d3fe5cb..2748f170a7 100644 --- a/src/scripts/Spells/spell_item.cpp +++ b/src/scripts/Spells/spell_item.cpp @@ -1255,7 +1255,7 @@ class spell_item_summon_or_dismiss : public SpellScriptLoader { for (Unit::ControlSet::iterator itr = GetCaster()->m_Controlled.begin(); itr != GetCaster()->m_Controlled.end(); ++itr) { - if ((*itr)->GetEntry() == GetSpellInfo()->Effects[effIndex].MiscValue) + if (GetSpellInfo()->Effects[effIndex].MiscValue >= 0 && (*itr)->GetEntry() == uint32(GetSpellInfo()->Effects[effIndex].MiscValue)) { (*itr)->ToTempSummon()->UnSummon(); PreventHitDefaultEffect(effIndex); |