From 0c4d30f9ad7f8560fde10886d8afe59b9f7d408b Mon Sep 17 00:00:00 2001 From: Sattva Date: Sun, 21 May 2023 04:19:37 +0300 Subject: [PATCH] fix accept summon module --- Leatrix_Plus.lua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Leatrix_Plus.lua b/Leatrix_Plus.lua index e7538c2..9e4f175 100644 --- a/Leatrix_Plus.lua +++ b/Leatrix_Plus.lua @@ -5602,7 +5602,7 @@ -- Stop the progress bar under various circumstances hooksecurefunc("TaxiRequestEarlyLanding", CeaseProgress) hooksecurefunc("AcceptBattlefieldPort", CeaseProgress) - hooksecurefunc(C_SummonInfo, "ConfirmSummon", CeaseProgress) + hooksecurefunc("ConfirmSummon", CeaseProgress) -- Show flight time in node tooltips hooksecurefunc("TaxiNodeOnButtonEnter", function(button) @@ -5681,7 +5681,7 @@ hooksecurefunc("TaxiNodeOnButtonEnter", StopLandingEvent) hooksecurefunc("TaxiRequestEarlyLanding", StopLandingEvent) hooksecurefunc("AcceptBattlefieldPort", StopLandingEvent) - hooksecurefunc(C_SummonInfo, "ConfirmSummon", StopLandingEvent) + hooksecurefunc("ConfirmSummon", StopLandingEvent) ---------------------------------------------------------------------- -- Drag frame @@ -12238,15 +12238,16 @@ if event == "CONFIRM_SUMMON" then if not UnitAffectingCombat("player") then - local sName = C_SummonInfo.GetSummonConfirmSummoner() - local sLocation = C_SummonInfo.GetSummonConfirmAreaName() - LeaPlusLC:Print(L["The summon from"] .. " " .. sName .. " (" .. sLocation .. ") " .. L["will be automatically accepted in 10 seconds unless cancelled."]) + local sName = GetSummonConfirmSummoner() + local sLocation = GetSummonConfirmAreaName() + LeaPlusLC:Print(L["The summon from"] .. " |cFFFFFFFF" .. sName .. "|r - |cFFFFFF00(" .. sLocation .. ")|r " .. L["will be automatically accepted in |cFF00FF0010 seconds|r unless cancelled."]) + LibCompat.After(10, function() - local sNameNew = C_SummonInfo.GetSummonConfirmSummoner() - local sLocationNew = C_SummonInfo.GetSummonConfirmAreaName() + local sNameNew = GetSummonConfirmSummoner() + local sLocationNew = GetSummonConfirmAreaName() if sName == sNameNew and sLocation == sLocationNew then -- Automatically accept summon after 10 seconds if summoner name and location have not changed - C_SummonInfo.ConfirmSummon() + ConfirmSummon() StaticPopup_Hide("CONFIRM_SUMMON") end end)