pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-13 18:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix mana and timer being used on single target buffs failing

Browse Source 
Single target buffs shouldn't have their mana consumed or their
reuse timers set if they fail the Mob::SpellOnTarget call in
Mob::SpellFinished. Ex. Night's Dark Terror not taking hold
(no free slots) or Target running out of range.
Debuffs do not get this nice behavior.
This commit is contained in:
Michael Cook 2013-10-10 23:17:02 -04:00
parent 6154cfce99
commit da401acdb2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 10/10/2013 == == 10/10/2013 ==
Secrets: Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system. Secrets: Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system.
demonstar55: Beneficial single target buffs shouldn't have their mana/timers set if they fail to cast after the Mob::SpellOnTarget call in Mob::SpellFinished
== 10/09/2013 == == 10/09/2013 ==
demonstar55: Fixed some more instances of the AA timer being eaten demonstar55: Fixed some more instances of the AA timer being eaten

8
zone/spells.cpp
View File

@ -1818,9 +1818,13 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
if (isproc) { if (isproc) {
SpellOnTarget(spell_id, spell_target, false, true, resist_adjust, true); SpellOnTarget(spell_id, spell_target, false, true, resist_adjust, true);
} else { } else {
if(!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 if(IsBuffSpell(spell_id) && IsBeneficialSpell(spell_id)) {
// Prevent mana usage/timers being set for beneficial buffs
InterruptSpell(); InterruptSpell();
return false;
}
}
} }
if(IsPlayerIllusionSpell(spell_id) if(IsPlayerIllusionSpell(spell_id)
&& IsClient() && IsClient()