From fb6e8990922ab67139aa6d10de39ce53a9922b7d Mon Sep 17 00:00:00 2001 From: Jennifer Date: Tue, 24 Sep 2019 15:22:20 +0100 Subject: [PATCH] v8.2.0-Release-v2.2(0135) --- Core/Team.lua | 4 ++-- Locales/Core-Locale-enUS.lua | 1 - Modules/Trade.lua | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Core/Team.lua b/Core/Team.lua index 82c41f3..5ef4c42 100644 --- a/Core/Team.lua +++ b/Core/Team.lua @@ -1241,8 +1241,8 @@ function EMA:PARTY_INVITE_REQUEST( event, inviter, ... ) -- Accept an invite from friends? if EMA.db.inviteAcceptFriends == true then -- Iterate each friend; searching for the inviter in the friends list. - for friendIndex = 1, GetNumFriends() do - local friendName = GetFriendInfo( friendIndex ) + for friendIndex = 1, C_FriendList.GetNumOnlineFriends() do + local _, friendName = C_FriendList.GetFriendInfoByIndex( friendIndex ) -- Inviter found in friends list, allow the invite to be accepted. if inviter == friendName then acceptInvite = true diff --git a/Locales/Core-Locale-enUS.lua b/Locales/Core-Locale-enUS.lua index 3fe9cf3..d41afb7 100644 --- a/Locales/Core-Locale-enUS.lua +++ b/Locales/Core-Locale-enUS.lua @@ -738,7 +738,6 @@ L["WHISPERED_YOU"] = "Whispered You." ------------------------ -- Quest Locale - L["ABANDON_QUESTS_TEAM"] = "Would you like to Abandon \"%s\" On All Toons?" L["JUST_ME"] = "Just Me" L["ALL_TEAM"] = "All Team" diff --git a/Modules/Trade.lua b/Modules/Trade.lua index 146b631..4ef4ccf 100644 --- a/Modules/Trade.lua +++ b/Modules/Trade.lua @@ -570,6 +570,8 @@ function EMA:EMAOnSettingsReceived( characterName, settings ) EMA.db.blackListItem = settings.blackListItem EMA.db.tradeBoEItems = settings.tradeBoEItems EMA.db.tradeCRItems = settings.tradeCRItems + EMA.db.autoBoEItemTag = settings.autoBoEItemTag + EMA.db.autoCRItemTag = settings.autoCRItemTag EMA.db.autoTradeItemsList = EMAUtilities:CopyTable( settings.autoTradeItemsList ) EMA.db.global.autoTradeItemsListGlobal = EMAUtilities:CopyTable( settings.global.autoTradeItemsListGlobal ) EMA.db.adjustMoneyWithGuildBank = settings.adjustMoneyWithGuildBank -- 1.7.9.5