fix invincible aircraft, infantry

2010-11-05 20:18:52 +13:00
parent 480c5edd75
commit 85a26ecdf7
3 changed files with 15 additions and 7 deletions
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -141,9 +141,14 @@ namespace OpenRA.Network
 					}
 				default:
 					{
-						if (!order.IsImmediate)
-							foreach (var t in order.Subject.TraitsImplementing<IResolveOrder>())
-								t.ResolveOrder(order.Subject, order);
+						if( !order.IsImmediate )
+						{
+							var self = order.Subject;
+							var health = self.TraitOrDefault<Health>();
+							if( health == null || !health.IsDead )
+								foreach( var t in self.TraitsImplementing<IResolveOrder>() )
+									t.ResolveOrder( self, order );
+						}
 						break;
 					}
 			}