Fix minion data getting in xml of non minion skills (#5571)

* Fix minion data getting in xml

* More general solution

* Revert "Fix minion data getting in xml"

This reverts commit 68a0f15.

Author: QuickStick123

src/Modules/CalcActiveSkill.lua

@@ -234,6 +234,9 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 		end
 		activeSkill.skillPartName = part.name
 		skillFlags.multiPart = #activeGemParts > 1
+	elseif activeEffect.srcInstance then
+		activeEffect.srcInstance.skillPart = nil
+		activeEffect.srcInstance.skillPartCalcs = nil
 	end
 
 	if (skillTypes[SkillType.RequiresShield] or skillFlags.shieldAttack) and not activeSkill.summonSkill and (not activeSkill.actor.itemList["Weapon 2"] or activeSkill.actor.itemList["Weapon 2"].type ~= "Shield") then
@@ -504,6 +507,9 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 			skillModList:NewMod("Multiplier:ActiveMineCount", "BASE", activeSkill.activeMineCount, "Base")
 			env.enemy.modDB.multipliers["ActiveMineCount"] = m_max(activeSkill.activeMineCount or 0, env.enemy.modDB.multipliers["ActiveMineCount"] or 0)
 		end
+	elseif activeEffect.srcInstance then
+		activeEffect.srcInstance.skillMineCountCalcs = nil
+		activeEffect.srcInstance.skillMineCount = nil
 	end
 
 	if skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:"..activeGrantedEffect.name:gsub("%s+", "").."MaxStages") > 0 then
@@ -517,6 +523,9 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 				skillModList:NewMod("Multiplier:"..activeGrantedEffect.name:gsub("%s+", "").."StageAfterFirst", "BASE", m_min(limit - 1, activeSkill.activeStageCount), "Base")
 			end
 		end
+	elseif activeEffect.srcInstance then
+		activeEffect.srcInstance.skillStageCountCalcs = nil
+		activeEffect.srcInstance.skillStageCount = nil
 	end
 
 	-- Extract skill data
@@ -586,6 +595,9 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 					end
 					minion.itemSet = env.build.itemsTab.itemSets[activeEffect.srcInstance.skillMinionItemSet]
 				end
+			elseif activeEffect.srcInstance then
+				activeEffect.srcInstance.skillMinionItemSetCalcs = nil
+				activeEffect.srcInstance.skillMinionItemSet = nil
 			end
 			if activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.type == "Bow" then
 				minion.weaponData1 = env.player.weaponData1
@@ -625,6 +637,13 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 				end
 			end
 		end
+	elseif activeEffect.srcInstance then
+		activeEffect.srcInstance.skillMinionCalcs = nil
+		activeEffect.srcInstance.skillMinion = nil
+		activeEffect.srcInstance.skillMinionItemSetCalcs = nil
+		activeEffect.srcInstance.skillMinionItemSet = nil
+		activeEffect.srcInstance.skillMinionSkill = nil
+		activeEffect.srcInstance.skillMinionSkillCalcs = nil
 	end
 
 	-- Separate global effect modifiers (mods that can affect defensive stats or other skills)