Merge pull request #8319 from Mailaender/hacky-currentstate-nre

Fixed possible NREs in AI.StateMachine
2015-06-02 22:35:49 +02:00
parent 05e9b22af7 cd5c0eca79
commit 6650e3d9c7
1 changed files with 4 additions and 2 deletions
--- a/OpenRA.Mods.Common/AI/StateMachine.cs
+++ b/OpenRA.Mods.Common/AI/StateMachine.cs
@@ -17,6 +17,7 @@ namespace OpenRA.Mods.Common.AI

 		public void Update(Squad squad)
 		{
+			if (currentState != null)
 				currentState.Tick(squad);
 		}

@@ -31,6 +32,7 @@ namespace OpenRA.Mods.Common.AI
 			if (newState != null)
 				currentState = newState;

+			if (currentState != null)
 				currentState.Activate(squad);
 		}