Merge pull request #8423 from Mailaender/hashfrozenactor-nre

Fixed a NullReferenceException in Sync.HashTarget
2015-06-10 22:19:37 +02:00
parent 9f8d5bc12e 47a92c4511
commit 0ac78ef6a2
1 changed files with 3 additions and 0 deletions
--- a/OpenRA.Game/Sync.cs
+++ b/OpenRA.Game/Sync.cs
@@ -144,6 +144,9 @@ namespace OpenRA
 					return (int)(t.Actor.ActorID << 16) * 0x567;

 				case TargetType.FrozenActor:
+					if (t.FrozenActor.Actor == null)
+						return 0;
+
 					return (int)(t.FrozenActor.Actor.ActorID << 16) * 0x567;

 				case TargetType.Terrain: