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

Move triggered on cast things to after the spell

Browse Source 
This appears how live does it
This commit is contained in:
Michael Cook (mackal) 2016-01-06 13:30:50 -05:00
parent 20f5c42c3e
commit 17c45c8d36
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/spells.cpp
View File

@ -1268,6 +1268,14 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot,
} }
} }
// we're done casting, now try to apply the spell
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();
return;
}
if(IsClient()) { if(IsClient()) {
CheckNumHitsRemaining(NumHit::MatchingSpells); CheckNumHitsRemaining(NumHit::MatchingSpells);
TrySympatheticProc(target, spell_id); TrySympatheticProc(target, spell_id);
@ -1277,14 +1285,6 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot,
TryTriggerOnCast(spell_id, 0); TryTriggerOnCast(spell_id, 0);
// we're done casting, now try to apply the spell
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();
return;
}
if(DeleteChargeFromSlot >= 0) if(DeleteChargeFromSlot >= 0)
CastToClient()->DeleteItemInInventory(DeleteChargeFromSlot, 1, true); CastToClient()->DeleteItemInInventory(DeleteChargeFromSlot, 1, true);