added nil checks to raptor_spawner_defense (#4261)

beyond-all-reason · Jan 31, 2025 · 55ba1b2 · 55ba1b2
1 parent 2c2a0f0
commit 55ba1b2
Showing 1 changed file with 37 additions and 27 deletions.
diff --git a/luarules/gadgets/raptor_spawner_defense.lua b/luarules/gadgets/raptor_spawner_defense.lua
@@ -670,11 +670,13 @@ if gadgetHandler:IsSyncedCode() then
 			squad = { count .. " " .. raptorType }
 			for i, sString in pairs(squad) do
 				local nEnd, _ = string.find(sString, " ")
-				local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
-				local raptorName = string.sub(sString, (nEnd + 1))
-				for j = 1, unitNumber, 1 do
-					squadCounter = squadCounter + 1
-					table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+				if nEnd then
+					local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
+					local raptorName = string.sub(sString, (nEnd + 1))
+					for j = 1, unitNumber, 1 do
+						squadCounter = squadCounter + 1
+						table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+					end
 				end
 			end
 		else
@@ -700,11 +702,13 @@ if gadgetHandler:IsSyncedCode() then
 			if squad then
 				for i, sString in pairs(squad.units) do
 					local nEnd, _ = string.find(sString, " ")
-					local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
-					local raptorName = string.sub(sString, (nEnd + 1))
-					for j = 1, unitNumber, 1 do
-						squadCounter = squadCounter + 1
-						table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+					if nEnd then
+						local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
+						local raptorName = string.sub(sString, (nEnd + 1))
+						for j = 1, unitNumber, 1 do
+							squadCounter = squadCounter + 1
+							table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+						end
 					end
 				end
 			end
@@ -1103,13 +1107,15 @@ if gadgetHandler:IsSyncedCode() then
 					if squad then
 						for i, sString in pairs(squad.units) do
 							local nEnd, _ = string.find(sString, " ")
-							local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
-							local raptorName = string.sub(sString, (nEnd + 1))
-							for j = 1, unitNumber, 1 do
-								squadCounter = squadCounter + 1
-								table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+							if nEnd then
+								local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
+								local raptorName = string.sub(sString, (nEnd + 1))
+								for j = 1, unitNumber, 1 do
+									squadCounter = squadCounter + 1
+									table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+								end
+								cCount = cCount + unitNumber
 							end
-							cCount = cCount + unitNumber
 						end
 					end
 					if loopCounter <= 1 then
@@ -1125,13 +1131,15 @@ if gadgetHandler:IsSyncedCode() then
 						if squad then
 							for i, sString in pairs(squad.units) do
 								local nEnd, _ = string.find(sString, " ")
-								local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
-								local raptorName = string.sub(sString, (nEnd + 1))
-								for j = 1, unitNumber, 1 do
-									squadCounter = squadCounter + 1
-									table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+								if nEnd then
+									local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
+									local raptorName = string.sub(sString, (nEnd + 1))
+									for j = 1, unitNumber, 1 do
+										squadCounter = squadCounter + 1
+										table.insert(spawnQueue, { burrow = burrowID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+									end
+									cCount = cCount + unitNumber
 								end
-								cCount = cCount + unitNumber
 							end
 						end
 					end
@@ -1398,11 +1406,13 @@ if gadgetHandler:IsSyncedCode() then
 							if squad then
 								for i, sString in pairs(squad.units) do
 									local nEnd, _ = string.find(sString, " ")
-									local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
-									local raptorName = string.sub(sString, (nEnd + 1))
-									for j = 1, unitNumber, 1 do
-										squadCounter = squadCounter + 1
-										table.insert(spawnQueue, { burrow = queenID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+				 					if nEnd then
+										local unitNumber = mRandom(1, string.sub(sString, 1, (nEnd - 1)))
+										local raptorName = string.sub(sString, (nEnd + 1))
+										for j = 1, unitNumber, 1 do
+											squadCounter = squadCounter + 1
+											table.insert(spawnQueue, { burrow = queenID, unitName = raptorName, team = raptorTeamID, squadID = squadCounter })
+										end
 									end
 								end
 							end