From ea1ae1a0a4477141e049a51a992e85adc8106ebe Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Mon, 29 Aug 2016 13:27:42 -0400 Subject: [PATCH] Use StopCasting instead of Interrupt on SpellFinished failure Most of these failures already show a message, live doesn't double up on failure message + interrupt message, so lets not There are a few logic error returns, but those really shouldn't happen --- zone/spells.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index e12f8042f..42457c93f 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -1310,7 +1310,9 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo if( !SpellFinished(spell_id, spell_target, slot, mana_used, inventory_slot, resist_adjust) ) { Log.Out(Logs::Detail, Logs::Spells, "Casting of %d canceled: SpellFinished returned false.", spell_id); - InterruptSpell(); + // most of the cases we return false have a message already or are logic errors that shouldn't happen + // if there are issues I guess we can do something else, but this should work + StopCasting(); return; }