pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +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
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+2 -2
View File
@@ -1524,7 +1524,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
//Guard Assist Code
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);
for (auto& e : mob_list) {
auto mob = e.second;
@@ -2023,7 +2023,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
//Guard Assist Code
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);
for (auto& e : mob_list) {
auto mob = e.second;