Skip to content

Commit dacbc90

Browse files
authored
FIX: LIST type mods being duplicated (#8977)
Most likely caused by #8862
1 parent 78326a6 commit dacbc90

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/Classes/ModList.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function ModListClass:ReplaceModInternal(mod)
4545
return false
4646
end
4747

48-
function ModListClass:MergeMod(mod)
48+
function ModListClass:MergeMod(mod, skipNonAdditive)
4949
if mod.type == "BASE" or mod.type == "INC" or mod.type == "MORE" then
5050
for i = 1, #self do
5151
if modLib.compareModParams(self[i], mod) then
@@ -55,7 +55,9 @@ function ModListClass:MergeMod(mod)
5555
end
5656
end
5757
end
58-
self:AddMod(mod)
58+
if not skipNonAdditive then
59+
self:AddMod(mod)
60+
end
5961
end
6062

6163
function ModListClass:AddList(modList)

src/Modules/CalcSetup.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ function calcs.initEnv(build, mode, override, specEnv)
10671067
local scaledList = new("ModList")
10681068
scaledList:ScaleAddList(combinedList, scale)
10691069
for _, mod in ipairs(scaledList) do
1070-
combinedList:MergeMod(mod)
1070+
combinedList:MergeMod(mod, true)
10711071
end
10721072
env.itemModDB:AddList(combinedList)
10731073
elseif item.type == "Boots" and calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots") ~= 1 then
@@ -1079,7 +1079,7 @@ function calcs.initEnv(build, mode, override, specEnv)
10791079
local scaledList = new("ModList")
10801080
scaledList:ScaleAddList(combinedList, scale)
10811081
for _, mod in ipairs(scaledList) do
1082-
combinedList:MergeMod(mod)
1082+
combinedList:MergeMod(mod, true)
10831083
end
10841084
env.itemModDB:AddList(combinedList)
10851085
else

0 commit comments

Comments
 (0)