fix accept summon module

This commit is contained in:
Sattva
2023-05-21 04:19:37 +03:00
parent be0b158b4e
commit 0c4d30f9ad
+9 -8
View File
@@ -5602,7 +5602,7 @@
-- Stop the progress bar under various circumstances -- Stop the progress bar under various circumstances
hooksecurefunc("TaxiRequestEarlyLanding", CeaseProgress) hooksecurefunc("TaxiRequestEarlyLanding", CeaseProgress)
hooksecurefunc("AcceptBattlefieldPort", CeaseProgress) hooksecurefunc("AcceptBattlefieldPort", CeaseProgress)
hooksecurefunc(C_SummonInfo, "ConfirmSummon", CeaseProgress) hooksecurefunc("ConfirmSummon", CeaseProgress)
-- Show flight time in node tooltips -- Show flight time in node tooltips
hooksecurefunc("TaxiNodeOnButtonEnter", function(button) hooksecurefunc("TaxiNodeOnButtonEnter", function(button)
@@ -5681,7 +5681,7 @@
hooksecurefunc("TaxiNodeOnButtonEnter", StopLandingEvent) hooksecurefunc("TaxiNodeOnButtonEnter", StopLandingEvent)
hooksecurefunc("TaxiRequestEarlyLanding", StopLandingEvent) hooksecurefunc("TaxiRequestEarlyLanding", StopLandingEvent)
hooksecurefunc("AcceptBattlefieldPort", StopLandingEvent) hooksecurefunc("AcceptBattlefieldPort", StopLandingEvent)
hooksecurefunc(C_SummonInfo, "ConfirmSummon", StopLandingEvent) hooksecurefunc("ConfirmSummon", StopLandingEvent)
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- Drag frame -- Drag frame
@@ -12238,15 +12238,16 @@
if event == "CONFIRM_SUMMON" then if event == "CONFIRM_SUMMON" then
if not UnitAffectingCombat("player") then if not UnitAffectingCombat("player") then
local sName = C_SummonInfo.GetSummonConfirmSummoner() local sName = GetSummonConfirmSummoner()
local sLocation = C_SummonInfo.GetSummonConfirmAreaName() local sLocation = GetSummonConfirmAreaName()
LeaPlusLC:Print(L["The summon from"] .. " " .. sName .. " (" .. sLocation .. ") " .. L["will be automatically accepted in 10 seconds unless cancelled."]) 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() LibCompat.After(10, function()
local sNameNew = C_SummonInfo.GetSummonConfirmSummoner() local sNameNew = GetSummonConfirmSummoner()
local sLocationNew = C_SummonInfo.GetSummonConfirmAreaName() local sLocationNew = GetSummonConfirmAreaName()
if sName == sNameNew and sLocation == sLocationNew then if sName == sNameNew and sLocation == sLocationNew then
-- Automatically accept summon after 10 seconds if summoner name and location have not changed -- Automatically accept summon after 10 seconds if summoner name and location have not changed
C_SummonInfo.ConfirmSummon() ConfirmSummon()
StaticPopup_Hide("CONFIRM_SUMMON") StaticPopup_Hide("CONFIRM_SUMMON")
end end
end) end)