From bd68720db3a35eb43f0d01cb3562fa3b8c0c37de Mon Sep 17 00:00:00 2001
From: andrew6180 <16847730+andrew6180@users.noreply.github.com>
Date: Mon, 20 May 2024 11:43:24 -0700
Subject: [PATCH] Parser: handle spell school swaps for pets

---
 core/parser.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/parser.lua b/core/parser.lua
index 22a9f8c9..fa9e9729 100755
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -557,7 +557,8 @@
 
 		--melee
 		if (token == "SWING_DAMAGE") then
-			spellId, spellName, spellType, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand = 1, meleeString, 00000001, spellId, spellName, spellType, amount, overkill, school, resisted, blocked, absorbed, critical
+			-- school or 00000001 because pets can have different melee damage types.
+			spellId, spellName, spellType, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand = 1, meleeString, school or 00000001, spellId, spellName, spellType, amount, overkill, school, resisted, blocked, absorbed, critical
 		end
 
 		if (not targetName) then
@@ -1140,6 +1141,10 @@
 			end
 		end
 
+		if spellTable.spellschool ~= (spellType or school) then
+			spellTable.spellschool = spellType or school -- damage change REs can get cached as the wrong school type
+		end
+
 		--empowerment data
 		if (empower_cache[sourceSerial]) then
 			local empowerSpellInfo = empower_cache[sourceSerial][spellName]