From 5bf67c75d59f5ee137549c613e158d491ea18de7 Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 3 Feb 2017 20:22:50 +0000 Subject: [PATCH] Fixed issue when user tries to hyperspace to a point and that point does not exist. --- .../game/script/space/combat/combat_ship_player.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java index 67256adeb..f11b53deb 100755 --- a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java +++ b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java @@ -593,10 +593,13 @@ public class combat_ship_player extends script.base_script } LOG("space", "params is " + params); String hyperspacePoint = strParams[0]; + String sceneName = getSceneForHyperspacePoint(hyperspacePoint); + if(sceneName == null || sceneName.equals("")){ + LOG("space","WARNING: Unable to get hyperspace scene name from hyperspacePoint (" + hyperspacePoint + "). Self (" + self + ":" + getName(self) + "), Target(" + target + ":" + getName(target) + ")."); + } if (!isGod(self)) { - String sceneName = getSceneForHyperspacePoint(hyperspacePoint); - if (sceneName.equals("space_kashyyyk")) + if (sceneName != null && sceneName.equals("space_kashyyyk")) { if (!features.hasEpisode3Expansion(self)) {