Fixing many parsing issues

tdymel · Jul 26, 2018 · 1f508db · 1f508db
1 parent 0d77106
commit 1f508db
Show file tree

Hide file tree

Showing 2 changed files with 368 additions and 163 deletions.
diff --git a/DPSMate/DPSMate_DataBuilder.lua b/DPSMate/DPSMate_DataBuilder.lua
@@ -1357,6 +1357,11 @@ end
 local ActiveMob = {}
 function DPSMate.DB:EnemyDamage(mode, arr, Duser, Dname, Dhit, Dcrit, Dmiss, Dparry, Ddodge, Dresist, Damount, cause, Dblock, Dcrush)
 	ActiveMob[cause] = true
+
+	local saveUser = Duser
+	local saveCause = cause
+	local saveAb = Dname
+
 	Duser = self:BuildUser(Duser)
 	cause = self:BuildUser(cause)
 
@@ -1380,6 +1385,11 @@ function DPSMate.DB:EnemyDamage(mode, arr, Duser, Dname, Dhit, Dcrit, Dmiss, Dpa
 
 	Dname = self:BuildAbility(Dname)
 
+	if Dname == nil or cause == nil or Duser == nil or Damount == nil then
+		DPSMate:SendMessage("Ab/Cause/Duser/amount: one of them is nil: "..(saveAb or "NONE").."/"..(saveCause or "NONE").."/"..(saveUser or "NONE").."/"..(Damount or "NONE"))
+		return
+	end
+
 	for cat=1,2 do 
 		gen = arr[cat]
 		if not gen[cause] then gen[cause] = {} end