From 5daaa9910850e8f1849a4a14552faf14c31b7eda Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 1 Aug 2010 11:35:26 +1200
Subject: [PATCH] start cleaning up reservations

---
 OpenRA.Mods.RA/Reservable.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Mods.RA/Reservable.cs b/OpenRA.Mods.RA/Reservable.cs
index a6ac5707d2..f78a47e186 100644
--- a/OpenRA.Mods.RA/Reservable.cs
+++ b/OpenRA.Mods.RA/Reservable.cs
@@ -11,8 +11,6 @@
 using System;
 using OpenRA.Traits;
 
-// TODO: strip out this mechanism - it doesnt really work.
-
 namespace OpenRA.Mods.RA
 {
 	class ReservableInfo : TraitInfo<Reservable> { }
@@ -26,7 +24,8 @@ namespace OpenRA.Mods.RA
 			if (reservedFor == null) 
 				return;		/* nothing to do */
 
-			if (reservedFor.IsDead()) reservedFor = null;		/* not likely to arrive now. */
+			if (reservedFor.IsDead() || !reservedFor.IsInWorld)
+				reservedFor = null;		/* not likely to arrive now. */
 		}
 
 		public IDisposable Reserve(Actor forActor)