pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-01 11:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed more instances of AA timers being eaten

Browse Source 
Every time I touch zone/AA.cpp to fix timers it gets uglier.
This should fix the bug reported here: http://www.peqtgc.com/phpBB3/viewtopic.php?f=17&t=14125
It should also fix AAs not being reset when it when you have no buff slots free (confirmed on live)
This commit is contained in:
Michael Cook
2013-10-09 02:00:49 -04:00
parent 9a19a00bdc
commit 3a95f81196
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+5 -2
View File
@@ -1818,7 +1818,9 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
if (isproc) {
SpellOnTarget(spell_id, spell_target, false, true, resist_adjust, true);
} else {
SpellOnTarget(spell_id, spell_target, false, true, resist_adjust, false);
if(!SpellOnTarget(spell_id, spell_target, false, true, resist_adjust, false))
if(casting_spell_type == 1) // AA failed to cast, InterruptSpell to reset timer
InterruptSpell();
}
if(IsPlayerIllusionSpell(spell_id)
&& IsClient()
@@ -3478,7 +3480,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
// if SpellEffect returned false there's a problem applying the
// spell. It's most likely a buff that can't stack.
mlog(SPELLS__CASTING_ERR, "Spell %d could not apply its effects %s -> %s\n", spell_id, GetName(), spelltar->GetName());
Message_StringID(MT_Shout, SPELL_NO_HOLD);
if(casting_spell_type != 1) // AA is handled differently
Message_StringID(MT_Shout, SPELL_NO_HOLD);
safe_delete(action_packet);
return false;
}