From 9ae45b15f4d6e920d99e5a053dd00d2f146733bc Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Sat, 22 Oct 2016 20:08:59 +0200
Subject: [PATCH] Fixed an issue where resuscitation timers weren't being
 cancelled

---
 src/services/combat/CorpseService.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java
index 040d661b9..0dbc89924 100644
--- a/src/services/combat/CorpseService.java
+++ b/src/services/combat/CorpseService.java
@@ -337,6 +337,15 @@ public final class CorpseService extends Service {
 			return CloneResult.INVALID_CELL;
 		}
 		
+		// Cancel the forced cloning timer
+		synchronized (reviveTimers) {
+			Future<?> timer = reviveTimers.remove(corpse);
+			
+			if (timer != null) {
+				timer.cancel(false);
+			}
+		}
+		
 		teleport(corpse, cellObject, getCloneLocation(facilityData, selectedFacility));
 		return CloneResult.SUCCESS;
 	}