From c2c505c8945ce0ba2aeb064191c6eb0b50b986aa Mon Sep 17 00:00:00 2001
From: Gethe <gethe88@gmail.com>
Date: Wed, 23 Aug 2023 22:15:17 +0000
Subject: [PATCH] 1.14.4 (51056)

---
 Interface/FrameXML/SettingDefinitions/CombatOverrides.lua | 8 +++++---
 Interface/FrameXML/UnitPopupUtils.lua                     | 6 +++++-
 Interface_Vanilla/FrameXML/UnitPopupButtons.lua           | 5 +----
 Interface_Vanilla/GlueXML/CharacterSelect.xml             | 4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Interface/FrameXML/SettingDefinitions/CombatOverrides.lua b/Interface/FrameXML/SettingDefinitions/CombatOverrides.lua
index 932cd42fcd..45dcbadfc3 100644
--- a/Interface/FrameXML/SettingDefinitions/CombatOverrides.lua
+++ b/Interface/FrameXML/SettingDefinitions/CombatOverrides.lua
@@ -105,9 +105,11 @@ function CombatOverrides.AdjustCombatSettings(category)
 	Settings.SetupCVarCheckBox(category, "floatingCombatTextCombatHealing", SHOW_COMBAT_HEALING_TEXT, OPTION_TOOLTIP_SHOW_COMBAT_HEALING);
 	Settings.SetOnValueChangedCallback("floatingCombatTextCombatHealing", UpdateFloatingCombatTextSafe);
 
-	-- Auto Attack/Auto Shot
-	Settings.SetupCVarCheckBox(category, "autoRangedCombat", AUTO_RANGED_COMBAT_TEXT, OPTION_TOOLTIP_AUTO_RANGED_COMBAT);
-	Settings.SetOnValueChangedCallback("autoRangedCombat", UpdateFloatingCombatTextSafe);
+	if ClassicExpansionAtLeast(LE_EXPANSION_BURNING_CRUSADE) then
+		-- Auto Attack/Auto Shot
+		Settings.SetupCVarCheckBox(category, "autoRangedCombat", AUTO_RANGED_COMBAT_TEXT, OPTION_TOOLTIP_AUTO_RANGED_COMBAT);
+		Settings.SetOnValueChangedCallback("autoRangedCombat", UpdateFloatingCombatTextSafe);
+	end
 
 end
 
diff --git a/Interface/FrameXML/UnitPopupUtils.lua b/Interface/FrameXML/UnitPopupUtils.lua
index 301b4274f8..9c49165559 100644
--- a/Interface/FrameXML/UnitPopupUtils.lua
+++ b/Interface/FrameXML/UnitPopupUtils.lua
@@ -58,7 +58,11 @@ end
 
 function UnitPopupSharedUtil:GetFullPlayerName()
 	local dropdownFrame = UnitPopupSharedUtil.GetCurrentDropdownMenu();
-	return dropdownFrame.name;
+	local fullName = dropdownFrame.name;
+	if ( dropdownFrame.server and ((not dropdownFrame.unit and GetNormalizedRealmName() ~= dropdownFrame.server) or (dropdownFrame.unit and UnitRealmRelationship(dropdownFrame.unit) ~= LE_REALM_RELATION_SAME)) ) then
+		fullName = dropdownFrame.name.."-"..dropdownFrame.server;
+	end
+	return fullName; 
 end		
 
 function UnitPopupSharedUtil:HasLFGRestrictions()
diff --git a/Interface_Vanilla/FrameXML/UnitPopupButtons.lua b/Interface_Vanilla/FrameXML/UnitPopupButtons.lua
index 679235a70a..cf8cf6df1a 100644
--- a/Interface_Vanilla/FrameXML/UnitPopupButtons.lua
+++ b/Interface_Vanilla/FrameXML/UnitPopupButtons.lua
@@ -62,10 +62,7 @@ function UnitPopupInviteButtonMixin:CanShow()
 end
 
 function UnitPopupDungeonDifficultyButtonMixin:CanShow()
-	if ( UnitLevel("player") < 65 and GetDungeonDifficultyID() == 1 ) then
-		return false; 
-	end
-	return true; 
+	return false;
 end
 
 function UnitPopupAchievementButtonMixin:CanShow()
diff --git a/Interface_Vanilla/GlueXML/CharacterSelect.xml b/Interface_Vanilla/GlueXML/CharacterSelect.xml
index a696a514db..ed67c12491 100644
--- a/Interface_Vanilla/GlueXML/CharacterSelect.xml
+++ b/Interface_Vanilla/GlueXML/CharacterSelect.xml
@@ -96,9 +96,9 @@
 					</Layer>
 					<Layer level="OVERLAY">
 						<Texture parentKey="graveIcon" atlas="poi-graveyard-neutral" hidden="true">
-							<Size x="24" y="32"/>
+							<Size x="12" y="16"/>
 							<Anchors>
-								<Anchor point="LEFT" x="-46" y="-12" relativeTo="$parentName"/>
+								<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="$parentName"/>
 							</Anchors>
 						</Texture>
 					</Layer>