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

[Bug] NPCs will now only proc on hit (#3913)

Browse Source
This commit is contained in:
Fryguy 2024-01-08 02:47:55 -05:00 committed by GitHub
parent 195cb80d56
commit b30fbc70a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
zone/attack.cpp
View File

@ -2281,49 +2281,51 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
if (other->IsClient() && IsPet() && GetOwner()->IsClient()) { if (other->IsClient() && IsPet() && GetOwner()->IsClient()) {
//pets do half damage to clients in pvp //pets do half damage to clients in pvp
my_hit.damage_done /= 2; my_hit.damage_done /= 2;
if (my_hit.damage_done < 1) if (my_hit.damage_done < 1) {
my_hit.damage_done = 1; my_hit.damage_done = 1;
}
} }
} } else {
else {
my_hit.damage_done = DMG_INVULNERABLE; my_hit.damage_done = DMG_INVULNERABLE;
} }
if (GetHP() > 0 && !other->HasDied()) { if (GetHP() > 0 && !other->HasDied()) {
other->Damage(this, my_hit.damage_done, SPELL_UNKNOWN, my_hit.skill, true, -1, false, m_specialattacks); // Not avoidable client already had thier chance to Avoid other->Damage(this, my_hit.damage_done, SPELL_UNKNOWN, my_hit.skill, true, -1, false, m_specialattacks); // Not avoidable client already had thier chance to Avoid
} else {
return false;
} }
else
return false;
if (HasDied()) //killed by damage shield ect if (HasDied()) { //killed by damage shield ect
return false; return false;
}
MeleeLifeTap(my_hit.damage_done); MeleeLifeTap(my_hit.damage_done);
CommonBreakInvisibleFromCombat(); CommonBreakInvisibleFromCombat();
//I doubt this works... //I doubt this works...
if (!GetTarget()) if (!GetTarget()) {
return true; //We killed them return true; //We killed them
if (!bRiposte && !other->HasDied()) {
TryWeaponProc(nullptr, weapon, other, Hand); //no weapon
if (!other->HasDied())
TrySpellProc(nullptr, weapon, other, Hand);
if (my_hit.damage_done > 0 && HasSkillProcSuccess() && !other->HasDied())
TrySkillProc(other, my_hit.skill, 0, true, Hand);
} }
if (GetHP() > 0 && !other->HasDied()) bool has_hit = my_hit.damage_done > 0;
if (has_hit && !bRiposte && !other->HasDied()) {
TryWeaponProc(nullptr, weapon, other, Hand);
if (!other->HasDied()) {
TrySpellProc(nullptr, weapon, other, Hand);
}
if (HasSkillProcSuccess() && !other->HasDied()) {
TrySkillProc(other, my_hit.skill, 0, true, Hand);
}
}
if (GetHP() > 0 && !other->HasDied()) {
TriggerDefensiveProcs(other, Hand, true, my_hit.damage_done); TriggerDefensiveProcs(other, Hand, true, my_hit.damage_done);
}
if (my_hit.damage_done > 0) return has_hit;
return true;
else
return false;
} }
void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {