From 1b15ee141d77efc91725a0c5fe7a68a8734aba29 Mon Sep 17 00:00:00 2001
From: regneq <rregenn@gmail.com>
Date: Sat, 7 Mar 2020 18:38:38 -0800
Subject: [PATCH] Faction always conned indifferent in no combat zone such as
 PoK, Nexus, etc regardless of faction level as evident with Planar Traveler's
 Manual (faction modifier) and restocking high quality ore (faction reward) in
 Bazaar and PoK.

---
 zone/client.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zone/client.cpp b/zone/client.cpp
index 8b60b391a..8c4b42957 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -7797,6 +7797,8 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra
 	// few optimizations
 	if (GetFeigned())
 		return FACTION_INDIFFERENT;
+	if(!zone->CanDoCombat())
+		return FACTION_INDIFFERENT;
 	if (invisible_undead && tnpc && !tnpc->SeeInvisibleUndead())
 		return FACTION_INDIFFERENT;
 	if (IsInvisible(tnpc))