diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2022-02-22 23:53:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 23:53:37 +0200 |
| commit | 9ee6f4fb115d177d907ab48a9f9c5f39ba239046 (patch) | |
| tree | 6dd704f10f7035b5eab34f4ecce7302292cc7ae8 /src/server/scripts/Spells | |
| parent | 3c0e798cb943fba8e1df2d9c0b1028e75bc291b6 (diff) | |
Scripts/Misc: Adjustments to previous fixes (#27821)
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 7b7b1121bbd..427aacdf6f6 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1072,8 +1072,8 @@ class spell_gen_consumption : public SpellScript void HandleDamageCalc(SpellEffIndex /*effIndex*/) { - Unit* caster = GetCaster(); - if (!caster || caster->GetTypeId() != TYPEID_UNIT) + Creature* caster = GetCaster()->ToCreature(); + if (!caster) return; uint32 damage = 0; @@ -1960,7 +1960,7 @@ class spell_gen_injured : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_injured::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit += SpellEffectFn(spell_gen_injured::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3725,10 +3725,9 @@ class spell_gen_whisper_to_controller : public SpellScript void HandleScript(SpellEffIndex /*effIndex*/) { - if (Unit* caster = GetCaster()) - if (TempSummon* casterSummon = caster->ToTempSummon()) - if (Player* target = casterSummon->GetSummonerUnit()->ToPlayer()) - casterSummon->Unit::Whisper(uint32(GetEffectValue()), target, false); + if (TempSummon* casterSummon = GetCaster()->ToTempSummon()) + if (Player* target = casterSummon->GetSummonerUnit()->ToPlayer()) + casterSummon->Unit::Whisper(uint32(GetEffectValue()), target, false); } void Register() override |