pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-24 03:22:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Undo changes

Browse Source
This commit is contained in:
Paul Coene 2016-12-08 16:06:32 -05:00
parent baf9336617
commit 95efc3a66c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/attack.cpp
View File

@ -1217,8 +1217,14 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
CommonBreakInvisibleFromCombat(); CommonBreakInvisibleFromCombat();
// Defensive procs from opponent happen here.
// We, the attacker check for them and make them happen.
// Added 2nd check for spell based defensive procs on opponent.
if(GetTarget()) if(GetTarget())
{
TriggerDefensiveProcs(other, Hand, true, damage); TriggerDefensiveProcs(other, Hand, true, damage);
TriggerDefensiveProcs(other, Hand, false);
}
if (damage > 0) if (damage > 0)
return true; return true;
@ -1783,8 +1789,14 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
TrySkillProc(other, skillinuse, 0, true, Hand); TrySkillProc(other, skillinuse, 0, true, Hand);
} }
// Defensive procs from opponent happen here.
// We, the attacker check for them and make them happen.
// Added 2nd check for spell based defensive procs on opponent.
if(GetHP() > 0 && !other->HasDied()) if(GetHP() > 0 && !other->HasDied())
{
TriggerDefensiveProcs(other, Hand, true, damage); TriggerDefensiveProcs(other, Hand, true, damage);
TriggerDefensiveProcs(other, Hand, false);
}
if (damage > 0) if (damage > 0)
return true; return true;