From 882e3742d98ae5e366da80cef8cfcf5c8dcb5c54 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Tue, 11 Jun 2019 15:26:01 -0500
Subject: [PATCH] Make sure AC / Corrup and PhR do not auto scale unles auto
 scale criteria is met

---
 zone/npc_scale_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zone/npc_scale_manager.cpp b/zone/npc_scale_manager.cpp
index 4047b0e6f..5daabcb16 100644
--- a/zone/npc_scale_manager.cpp
+++ b/zone/npc_scale_manager.cpp
@@ -45,7 +45,7 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
 		return;
 	}
 
-	if (npc->GetAC() == 0) {
+	if (npc->GetAC() == 0 && is_auto_scaled) {
 		npc->ModifyNPCStat("ac", std::to_string(scale_data.ac).c_str());
 	}
 	if (npc->GetMaxHP() == 0) {
@@ -97,10 +97,10 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
 	if (npc->GetDR() == 0) {
 		npc->ModifyNPCStat("dr", std::to_string(scale_data.disease_resist).c_str());
 	}
-	if (npc->GetCorrup() == 0) {
+	if (npc->GetCorrup() == 0 && is_auto_scaled) {
 		npc->ModifyNPCStat("cor", std::to_string(scale_data.corruption_resist).c_str());
 	}
-	if (npc->GetPhR() == 0) {
+	if (npc->GetPhR() == 0 && is_auto_scaled) {
 		npc->ModifyNPCStat("phr", std::to_string(scale_data.physical_resist).c_str());
 	}
 	if (npc->GetMinDMG() == 0 && npc->GetMaxDMG() == 0) {