From 28b07d635a6a258f344e1a6a2d41882f5f0f2d87 Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Fri, 24 Jun 2022 19:04:52 -0400
Subject: [PATCH] [Spells] Target's Target Combat Range Rule (#2274)

---
 common/ruletypes.h | 1 +
 zone/spells.cpp    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/ruletypes.h b/common/ruletypes.h
index 248eaad5f..3cfda60ae 100644
--- a/common/ruletypes.h
+++ b/common/ruletypes.h
@@ -417,6 +417,7 @@ RULE_BOOL(Spells, UseSpellImpliedTargeting, false, "Replicates EQ2-style targeti
 RULE_BOOL(Spells, BuffsFadeOnDeath, true, "Disable to keep buffs from fading on death")
 RULE_BOOL(Spells, IllusionsAlwaysPersist, false, "Allows Illusions to persist beyond death and zoning always.")
 RULE_BOOL(Spells, UseItemCastMessage, false, "Enable to use the \"item begins to glow\" messages when casting from an item.")
+RULE_BOOL(Spells, TargetsTargetRequiresCombatRange, true, "Disable to remove combat range requirement from Target's Target Spell Target Type")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Combat)
diff --git a/zone/spells.cpp b/zone/spells.cpp
index cabe198f4..41f902384 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -2197,11 +2197,14 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		case ST_TargetsTarget:
 		{
 			Mob *spell_target_tot = spell_target ? spell_target->GetTarget() : nullptr;
-			if(!spell_target_tot)
+			if (!spell_target_tot) {
 				return false;
+			}
+			
 			//Verfied from live - Target's Target needs to be in combat range to recieve the effect
-			if (!CombatRange(spell_target))
+			if (RuleB(Spells, TargetsTargetRequiresCombatRange) && !CombatRange(spell_target)) {
 				return false;
+			}
 
 			spell_target = spell_target_tot;
 			CastAction = SingleTarget;