new possible fix for absorb order sorting. Bump Version.

This commit is contained in:
andrew6180
2024-12-09 12:22:55 -07:00
parent 3dfc122946
commit 10347c7465
3 changed files with 32 additions and 14 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
## SavedVariables: _detalhes_global, __details_backup, __details_debug ## SavedVariables: _detalhes_global, __details_backup, __details_debug
## SavedVariablesPerCharacter: _detalhes_database ## SavedVariablesPerCharacter: _detalhes_database
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibWindow-1.1, LibDBIcon-1.0, NickTag-1.0, LibDataBroker-1.1, LibGraph-2.0 ## OptionalDeps: Ace3, LibSharedMedia-3.0, LibWindow-1.1, LibDBIcon-1.0, NickTag-1.0, LibDataBroker-1.1, LibGraph-2.0
## Version: #Details.20240508.12892.160 ## Version: #Details.20240508.12893.160
## X-IconTexture: Interface\AddOns\Details\images\minimap ## X-IconTexture: Interface\AddOns\Details\images\minimap
## X-Curse-Project-ID: 61284 ## X-Curse-Project-ID: 61284
+5
View File
@@ -223,6 +223,11 @@ do
local Loc = _G.LibStub("AceLocale-3.0"):GetLocale("Details") local Loc = _G.LibStub("AceLocale-3.0"):GetLocale("Details")
local news = { local news = {
{"Ascension.12893.160", "December 9th, 2024"},
"Added Separate Extra Attacks option in Options -> Combat Log -> Parser Options.",
" - Separates on hit effects such as Fiery Weapon as uniquely tracked spells.",
"Cont. Possible fix for errors during combat related to absorb spells sorting.",
{"Ascension.12892.160", "November 15th, 2024"}, {"Ascension.12892.160", "November 15th, 2024"},
"Possible fix for errors during combat related to absorb spells sorting.", "Possible fix for errors during combat related to absorb spells sorting.",
"Removed end of run window from Mythic Plus for the time being since it was causing lua errors and did not work.", "Removed end of run window from Mythic Plus for the time being since it was causing lua errors and did not work.",
+26 -13
View File
@@ -1780,21 +1780,22 @@
-- https://github.com/TrinityCore/TrinityCore/blob/d81a9e5bc3b3e13b47332b3e7817bd0a0b228cbc/src/server/game/Spells/Auras/SpellAuraEffects.h#L313-L367 -- https://github.com/TrinityCore/TrinityCore/blob/d81a9e5bc3b3e13b47332b3e7817bd0a0b228cbc/src/server/game/Spells/Auras/SpellAuraEffects.h#L313-L367
-- absorb order from trinitycore -- absorb order from trinitycore
local function AbsorbAuraOrderPred(a, b) local function AbsorbAuraOrderPred(a, b)
if a == nil and b == nil then local spellA, _, _, _, spellNameA, _, timeA, buffExpTimeA = unpack(a)
return false local spellB, _, _, _, spellNameB, _, timeB, buffExpTimeB = unpack(b)
end
if a == nil then
return false
end
if b == nil then
return true
end
local spellA = a[1]
local spellB = b[2]
-- puts oldest absorb first if there is two with the same id. -- puts oldest absorb first if there is two with the same id.
if spellA == spellB then if spellA == spellB then
return a[7] < b[7] if timeA ~= timeB then
return timeA < timeB
end
if buffExpTimeA ~= buffExpTimeB then
return buffExpTimeA < buffExpTimeB
end
if spellNameA ~= spellNameB then
return spellNameA < spellNameB
end
end end
-- twin val'kyr light essence -- twin val'kyr light essence
@@ -1878,7 +1879,19 @@
end end
-- sort oldest buffs to the top -- sort oldest buffs to the top
return a[7] < b[7] if timeA ~= timeB then
return timeA < timeB
end
if buffExpTimeA ~= buffExpTimeB then
return buffExpTimeA < buffExpTimeB
end
if spellNameA ~= spellNameB then
return spellNameA < spellNameB
end
return true
end end
local ignored_shields = { local ignored_shields = {