From 319c3c66d406ac29222c7345e94b44cacd9b223e Mon Sep 17 00:00:00 2001 From: Albert Valiev Date: Fri, 1 Sep 2023 19:04:47 +0200 Subject: [PATCH] 3.4.3 support --- Carbonite/Libs/AceDB-3.0/AceDB-3.0.lua | 6 +++--- Carbonite/NxMap.lua | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Carbonite/Libs/AceDB-3.0/AceDB-3.0.lua b/Carbonite/Libs/AceDB-3.0/AceDB-3.0.lua index 9e84705..44af472 100644 --- a/Carbonite/Libs/AceDB-3.0/AceDB-3.0.lua +++ b/Carbonite/Libs/AceDB-3.0/AceDB-3.0.lua @@ -40,8 +40,8 @@ -- end -- @class file -- @name AceDB-3.0.lua --- @release $Id: AceDB-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $ -local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27 +-- @release $Id: AceDB-3.0.lua 1306 2023-06-23 14:55:09Z nevcairiel $ +local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 28 local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR) if not AceDB then return end -- No upgrade needed @@ -260,7 +260,7 @@ local factionrealmKey = factionKey .. " - " .. realmKey local localeKey = GetLocale():lower() local regionTable = { "US", "KR", "EU", "TW", "CN" } -local regionKey = regionTable[GetCurrentRegion()] +local regionKey = regionTable[GetCurrentRegion()] or GetCurrentRegionName() or "TR" local factionrealmregionKey = factionrealmKey .. " - " .. regionKey -- Actual database initialization function diff --git a/Carbonite/NxMap.lua b/Carbonite/NxMap.lua index 026c364..4471bb5 100644 --- a/Carbonite/NxMap.lua +++ b/Carbonite/NxMap.lua @@ -11498,7 +11498,7 @@ function Nx.Map:UpdatePlayerPositions() -- Copy of the local defined player arro local atlas = UnitInSubgroup(unit) and "WhiteCircle-RaidBlips" or "WhiteDotCircle-RaidBlips" local class = select(2, UnitClass(unit)) local r, g, b = CheckColorOverrideForPVPInactive(unit, timeNow, GetClassColor(class)) - NXWorldMapUnitPositionFrame:AddUnitAtlas(unit, atlas, Nx.db.profile.Map.InstanceGroupSize, Nx.db.profile.Map.InstanceGroupSize, r, g, b, 1) + NXWorldMapUnitPositionFrame:AddUnit(unit, atlas, Nx.db.profile.Map.InstanceGroupSize, Nx.db.profile.Map.InstanceGroupSize, r, g, b, 1) end end @@ -11538,7 +11538,7 @@ function Nx.Map.NXWorldMapUnitPositionFrame_UpdateFull(timeNow) local atlas = UnitInSubgroup(unit) and "WhiteCircle-RaidBlips" or "WhiteDotCircle-RaidBlips" local class = select(2, UnitClass(unit)) local r, g, b = CheckColorOverrideForPVPInactive(unit, timeNow, GetClassColor(class)) - NXWorldMapUnitPositionFrame:AddUnitAtlas(unit, atlas, Nx.db.profile.Map.InstanceGroupSize, Nx.db.profile.Map.InstanceGroupSize, r, g, b, 1) + NXWorldMapUnitPositionFrame:AddUnit(unit, atlas, Nx.db.profile.Map.InstanceGroupSize, Nx.db.profile.Map.InstanceGroupSize, r, g, b, 1) end end