Merge pull request #49 from BMagnu/fixondeath

Remove deprecated OnDeath hook

Author: EatThePath

Cloak/data/tables/cloak-sct.tbm

@@ -384,10 +384,10 @@ $On Mission End:
 	end
 ]
 
-$On Death:
+$On Ship Death:
 [
 	if CloakSys.Enabled then
-		CloakSys:MaybeRemove(hv.Self:getSignature())		
+		CloakSys:MaybeRemove(hv.Ship:getSignature())		
 	end
 ]
 

ItemDrop/data/tables/itemdrop2-sct.tbm

@@ -336,10 +336,6 @@ function Items:DeathDropMaybe(ship)
 		return
 	end
 
-	if ship:getBreedName() ~= "Ship" then
-		return
-	end
-
 	local rightTeam = false
 
 	for i,v in ipairs(self.Config.Global.DropTeams) do
@@ -1071,13 +1067,13 @@ $On Frame:
 	end
 ]
 
-$On Death:
+$On Ship Death:
 [
 	if Items.Enabled then
-		if not Items:CheckContainerDeath(hv.Self) then
-			Items:DeathDropMaybe(hv.Self)
+		if not Items:CheckContainerDeath(hv.Ship) then
+			Items:DeathDropMaybe(hv.Ship)
 		end
 	end
 ]
 
-#End
+#End

SpawnSystem/data/tables/spawnsys-sct.tbm

@@ -621,10 +621,10 @@ $On Frame:
 
 ]
 
-$On Death:
+$On Ship Death:
 [
 	if SpawnSystem.Enabled and SpawnSystem.SpawnList then
-		SpawnSystem:RemoveShip(hv.Self)
+		SpawnSystem:RemoveShip(hv.Ship)
 	end
 ]
 

TrackingDevice/data/tables/trackingdevice-sct.tbm.21_0

@@ -160,24 +160,22 @@ $On Ship Depart:
 	end
 ]
 
-$On Death:
+$On Ship Death:
 [
 	-- if either the tracking device or the ship it tracks has been destroyed, remove the entry
 	local td = TrackingDevice
 	if td.Enabled then
-		if hv.Self:getBreedName() == "Ship" then
-			local ship_name = hv.Self.Name
-			local t = td.TrackerToTrackee
-			if t then
-				for tracker_name, trackee_name in pairs(t) do
-					-- remove entry
-					if tracker_name == ship_name or trackee_name == ship_name then
-						t[tracker_name] = nil
-					end
-					-- if the trackee was destroyed, destroy any trackers
-					if trackee_name == ship_name then
-						mn.evaluateSEXP("( self-destruct !" .. tracker_name .. "!)")
-					end
+		local ship_name = hv.Ship.Name
+		local t = td.TrackerToTrackee
+		if t then
+			for tracker_name, trackee_name in pairs(t) do
+				-- remove entry
+				if tracker_name == ship_name or trackee_name == ship_name then
+					t[tracker_name] = nil
+				end
+				-- if the trackee was destroyed, destroy any trackers
+				if trackee_name == ship_name then
+					mn.evaluateSEXP("( self-destruct !" .. tracker_name .. "!)")
 				end
 			end
 		end

radaricon/data/tables/radaricon-sct.tbm

@@ -645,10 +645,10 @@ $On Ship Depart:
 	end
 ]
 
-$On Death:
+$On Ship Death:
 [
-	if RadarIcon.Enabled and hv.Self:getBreedName() == "Ship" then
-		RadarIcon:MaybeDeleteShip(hv.Self)
+	if RadarIcon.Enabled then
+		RadarIcon:MaybeDeleteShip(hv.Ship)
 	end
 ]