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

[Bugfix] Fixes guards assisting mobs against players (#1448)

Browse Source 
Co-authored-by: ProducerZekServer <go@away.com>
This commit is contained in:
Gangsta 2021-07-08 09:39:58 -07:00 committed by GitHub
parent 36e009a5bd
commit c72a37a434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/attack.cpp
View File

@ -1524,7 +1524,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
//Guard Assist Code //Guard Assist Code
if (RuleB(Character, PVPEnableGuardFactionAssist)) { if (RuleB(Character, PVPEnableGuardFactionAssist)) {
if (IsClient() || (HasOwner() && GetOwner()->IsClient())) { if (IsClient() && other->IsClient() || (HasOwner() && GetOwner()->IsClient() && other->IsClient() )) {
auto& mob_list = entity_list.GetCloseMobList(other); auto& mob_list = entity_list.GetCloseMobList(other);
for (auto& e : mob_list) { for (auto& e : mob_list) {
auto mob = e.second; auto mob = e.second;
@ -2023,7 +2023,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
//Guard Assist Code //Guard Assist Code
if (RuleB(Character, PVPEnableGuardFactionAssist)) { if (RuleB(Character, PVPEnableGuardFactionAssist)) {
if (IsClient() || (HasOwner() && GetOwner()->IsClient())) { if (IsClient() && other->IsClient() || (HasOwner() && GetOwner()->IsClient() && other->IsClient())) {
auto& mob_list = entity_list.GetCloseMobList(other); auto& mob_list = entity_list.GetCloseMobList(other);
for (auto& e : mob_list) { for (auto& e : mob_list) {
auto mob = e.second; auto mob = e.second;

2
zone/spells.cpp
View File

@ -2057,7 +2057,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
//Guard Assist Code //Guard Assist Code
if (RuleB(Character, PVPEnableGuardFactionAssist) && spell_target && IsDetrimentalSpell(spell_id) && spell_target != this) { if (RuleB(Character, PVPEnableGuardFactionAssist) && spell_target && IsDetrimentalSpell(spell_id) && spell_target != this) {
if (IsClient() || (HasOwner() && GetOwner()->IsClient())) { if (IsClient() && spell_target->IsClient()|| (HasOwner() && GetOwner()->IsClient() && spell_target->IsClient())) {
auto& mob_list = entity_list.GetCloseMobList(spell_target); auto& mob_list = entity_list.GetCloseMobList(spell_target);
for (auto& e : mob_list) { for (auto& e : mob_list) {
auto mob = e.second; auto mob = e.second;