Replace explicit Dispose() calls with using statements in ScriptTrigger.cs

OpenRA.Mods.RA/Scripting/ScriptTriggers.cs

@@ -44,36 +44,25 @@ namespace OpenRA.Mods.RA.Scripting
 		public void TickIdle(Actor self)
 		{
 			foreach (var f in Triggers[Trigger.OnIdle])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
 					f.First.Call(a).Dispose();
-				a.Dispose();
-			}
 		}
 
 		public void Damaged(Actor self, AttackInfo e)
 		{
 			foreach (var f in Triggers[Trigger.OnDamaged])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
+				using (var b = e.Attacker.ToLuaValue(f.Second))
-				var b = e.Attacker.ToLuaValue(f.Second);
 					f.First.Call(a, b).Dispose();
-				a.Dispose();
-				b.Dispose();
-			}
 		}
 
 		public void Killed(Actor self, AttackInfo e)
 		{
 			// Run lua callbacks
 			foreach (var f in Triggers[Trigger.OnKilled])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
+				using (var b = e.Attacker.ToLuaValue(f.Second))
-				var b = e.Attacker.ToLuaValue(f.Second);
 					f.First.Call(a, b).Dispose();
-				a.Dispose();
-				b.Dispose();
-			}
 
 			// Run any internally bound callbacks
 			OnKilledInternal(self);
@@ -82,105 +71,71 @@ namespace OpenRA.Mods.RA.Scripting
 		public void UnitProduced(Actor self, Actor other, CPos exit)
 		{
 			foreach (var f in Triggers[Trigger.OnProduction])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
+				using (var b = other.ToLuaValue(f.Second))
-				var b = other.ToLuaValue(f.Second);
 					f.First.Call(a, b).Dispose();
-				a.Dispose();
-				b.Dispose();
-			}
 		}
 
 		public void OnPlayerWon(Player player)
 		{
 			foreach (var f in Triggers[Trigger.OnPlayerWon])
-			{
+				using (var a = player.ToLuaValue(f.Second))
-				var a = player.ToLuaValue(f.Second);
 					f.First.Call(a).Dispose();
-				a.Dispose();
-			}
 		}
 
 		public void OnPlayerLost(Player player)
 		{
 			foreach (var f in Triggers[Trigger.OnPlayerLost])
-			{
+				using (var a = player.ToLuaValue(f.Second))
-				var a = player.ToLuaValue(f.Second);
 					f.First.Call(a).Dispose();
-				a.Dispose();
-			}
 		}
 
 		public void OnObjectiveAdded(Player player, int id)
 		{
 			foreach (var f in Triggers[Trigger.OnObjectiveAdded])
-			{
+				using (var a = player.ToLuaValue(f.Second))
-				var a = player.ToLuaValue(f.Second);
+				using (var b = id.ToLuaValue(f.Second))
-				var b = id.ToLuaValue(f.Second);
 					f.First.Call(a, b).Dispose();
-				a.Dispose();
-				b.Dispose();
-			}
 		}
 
 		public void OnObjectiveCompleted(Player player, int id)
 		{
 			foreach (var f in Triggers[Trigger.OnObjectiveCompleted])
-			{
+				using (var a = player.ToLuaValue(f.Second))
-				var a = player.ToLuaValue(f.Second);
+				using (var b = id.ToLuaValue(f.Second))
-				var b = id.ToLuaValue(f.Second);
 					f.First.Call(a, b).Dispose();
-				a.Dispose();
-				b.Dispose();
-			}
 		}
 
 		public void OnObjectiveFailed(Player player, int id)
 		{
 			foreach (var f in Triggers[Trigger.OnObjectiveFailed])
-			{
+				using (var a = player.ToLuaValue(f.Second))
-				var a = player.ToLuaValue(f.Second);
+				using (var b = id.ToLuaValue(f.Second))
-				var b = id.ToLuaValue(f.Second);
 					f.First.Call(a, b).Dispose();
-				a.Dispose();
-				b.Dispose();
-			}
 		}
 
 		public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
 		{
 			foreach (var f in Triggers[Trigger.OnCapture])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
+				using (var b = captor.ToLuaValue(f.Second))
-				var b = captor.ToLuaValue(f.Second);
+				using (var c = oldOwner.ToLuaValue(f.Second))
-				var c = oldOwner.ToLuaValue(f.Second);
+				using (var d = newOwner.ToLuaValue(f.Second))
-				var d = newOwner.ToLuaValue(f.Second);
 					f.First.Call(a, b, c, d).Dispose();
-				a.Dispose();
-				b.Dispose();
-				c.Dispose();
-				d.Dispose();
-			}
 		}
 
 		public void AddedToWorld(Actor self)
 		{
 			foreach (var f in Triggers[Trigger.OnAddedToWorld])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
 					f.First.Call(a).Dispose();
-				a.Dispose();
-			}
 		}
 
 		public void RemovedFromWorld(Actor self)
 		{
 			foreach (var f in Triggers[Trigger.OnRemovedFromWorld])
-			{
+				using (var a = self.ToLuaValue(f.Second))
-				var a = self.ToLuaValue(f.Second);
 					f.First.Call(a).Dispose();
-				a.Dispose();
-			}
 		}
 
 		public void Clear(Trigger trigger)