From d1d994f87426c023862c2adbe3eb0c4cdff55878 Mon Sep 17 00:00:00 2001 From: Gutin1 Date: Sat, 24 Aug 2024 15:05:01 -0500 Subject: [PATCH] make it work with hyperspace --- .../ion/server/features/starship/PilotedStarships.kt | 2 ++ .../ion/server/features/starship/movement/StarshipMovement.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/PilotedStarships.kt b/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/PilotedStarships.kt index b8c9264e2f..c704c38d11 100644 --- a/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/PilotedStarships.kt +++ b/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/PilotedStarships.kt @@ -98,6 +98,8 @@ object PilotedStarships : IonServerComponent() { tryPilot(event.player, starship.data) + starship.pilotDisconnectLocation = null + event.player.success("Since you logged out while piloting, you were teleported back to your starship") } } diff --git a/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/movement/StarshipMovement.kt b/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/movement/StarshipMovement.kt index 089e4593f8..a1437473c2 100644 --- a/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/movement/StarshipMovement.kt +++ b/server/src/main/kotlin/net/horizonsend/ion/server/features/starship/movement/StarshipMovement.kt @@ -130,6 +130,7 @@ abstract class StarshipMovement(val starship: ActiveStarship, val newWorld: Worl starship.blocks = newLocationSet moveShipComputers(world2) updateDirectControlCenter() + moveDisconnectLocation() starship.calculateMinMax() updateCenter() updateSubsystems(world2)