Fixed ship deletion on invalid hyperspace jump

LemADEC · Sep 2, 2015 · 6ff8c43 · 6ff8c43
1 parent e3798ac
commit 6ff8c43
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/cr0s/warpdrive/EntityJump.java b/src/main/java/cr0s/warpdrive/EntityJump.java
@@ -431,6 +431,13 @@ private void prepareToJump() {
 			distance = 0; // FIXME: check collision in straight path, starting with getPossibleJumpDistance() ?
 		} else if (isHyperspaceJump) {
 			distance = 0;
+			if (!isInSpace && !isInHyperSpace) {
+				String msg = "Unable to reach hyperspace from a planet";
+				killEntity(msg);
+				messageToAllPlayersOnShip(msg);
+				LocalProfiler.stop();
+				return;
+			}
 		} else {
 			if (toSpace) {
 				// enter space at current altitude