Fixed an issue where resuscitation timers weren't being cancelled

This commit is contained in:
Mads Boddum
2016-10-22 20:08:59 +02:00
parent 35fa9840e6
commit 9ae45b15f4
+9
View File
@@ -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;
}