Use unmodified unit names

Anonomit · May 24, 2024 · 5fc66e6 · 5fc66e6
1 parent 2c1c394
commit 5fc66e6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/LootReserve.lua b/LootReserve.lua
@@ -504,7 +504,7 @@ function LootReserve:Player(player)
 end
 
 function LootReserve:Me()
-    return self:Player(UnitName("player"));
+    return self:Player(UnitNameUnmodified("player"));
 end
 
 function LootReserve:IsMe(player)
@@ -648,7 +648,7 @@ end
 
 local function GetRaidUnitID(player)
     for i = 1, MAX_RAID_MEMBERS do
-        local unit = UnitName("raid" .. i);
+        local unit = UnitNameUnmodified("raid" .. i);
         if unit and LootReserve:IsSamePlayer(LootReserve:Player(unit), player) then
             return "raid" .. i;
         end
@@ -661,7 +661,7 @@ end
 
 local function GetPartyUnitID(player)
     for i = 1, MAX_PARTY_MEMBERS do
-        local unit = UnitName("party" .. i);
+        local unit = UnitNameUnmodified("party" .. i);
         if unit and LootReserve:IsSamePlayer(LootReserve:Player(unit), player) then
             return "party" .. i;
         end

diff --git a/Server.lua b/Server.lua
@@ -930,7 +930,7 @@ function LootReserve.Server:UpdateTradeFrameAutoButton(accepting)
         return;
     end
 
-    local target        = LootReserve:Player(UnitName("npc"));
+    local target        = LootReserve:Player(UnitNameUnmodified("npc"));
     local itemsToInsert = { };
     local slotsFree     = 6;
     local relevantSlots = 0;

diff --git a/Windows/ServerWindow.lua b/Windows/ServerWindow.lua
@@ -583,7 +583,7 @@ function LootReserve.Server:UpdateRollList(lockdown)
                 frame.DistributeButton.Tradeable     = tradeable;
 
                 local unit = LootReserve:GetGroupUnitID(player);
-                if not unit and UnitExists("target") and UnitIsPlayer("target") and LootReserve:Player(UnitName("target")) == player then
+                if not unit and UnitExists("target") and UnitIsPlayer("target") and LootReserve:Player(UnitNameUnmodified("target")) == player then
                     unit = "target";
                 end
                 frame.DistributeButton.Unit = unit;

diff --git a/Windows/ServerWindow.xml b/Windows/ServerWindow.xml
@@ -674,7 +674,7 @@
 							end
 
 							self.Locator.m1 = DBM.HudMap:RegisterRangeMarkerOnPartyMember(87654, "party", LootReserve:Me(), 0.5, nil, color1.r, color1.g, color1.b, 1, nil, false);
-							self.Locator.m2 = DBM.HudMap:RegisterRangeMarkerOnPartyMember(87654, "party", UnitName(unit), 0.75, nil, color2.r, color2.g, color2.b, 1, nil, false);
+							self.Locator.m2 = DBM.HudMap:RegisterRangeMarkerOnPartyMember(87654, "party", UnitNameUnmodified(unit), 0.75, nil, color2.r, color2.g, color2.b, 1, nil, false);
 							self.Locator.edge = self.Locator.m2:EdgeTo(self.Locator.m1, nil, nil, 0, 1, 0, 1);
 
 							-- Play appearing animation
@@ -829,7 +829,7 @@
 
 						if not unit then return; end
 						if self.Lootable then
-							LootReserve.Server:MasterLootItem(item, LootReserve:Player(UnitName(unit)));
+							LootReserve.Server:MasterLootItem(item, LootReserve:Player(UnitNameUnmodified(unit)));
 						elseif self.Tradeable then
 							local bag, slot = LootReserve:GetBagSlot(item, true);
 							if bag and slot then
@@ -979,7 +979,7 @@
 										func = function(info)
 											local frame = self:GetParent():GetParent();
 											if not frame.Roll then return; end
-											local recipient = UnitIsPlayer("target") and UnitIsConnected("target") and UnitName("target");
+											local recipient = UnitIsPlayer("target") and UnitIsConnected("target") and UnitNameUnmodified("target");
 											if info.arg1 == "WHISPER" and not recipient then
 												LootReserve:PrintError("Target is not a valid player to whisper.")
 												return;
@@ -1089,7 +1089,7 @@
 										disabled = not condition,
 										func = function(info)
 											local frame = self:GetParent():GetParent();
-											local recipient = UnitIsPlayer("target") and UnitIsConnected("target") and UnitName("target");
+											local recipient = UnitIsPlayer("target") and UnitIsConnected("target") and UnitNameUnmodified("target");
 											if info.arg1 == "WHISPER" and not recipient then
 												LootReserve:PrintError("Target is not a valid player to whisper.")
 												return;