fix teleport command can't teleport ships between two dimensions. (#908)

ValkyrienSkies · Sep 23, 2024 · 17a8173 · 17a8173
1 parent a9ed052
commit 17a8173
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt
@@ -24,6 +24,7 @@ import org.valkyrienskies.core.impl.game.ShipTeleportDataImpl
 import org.valkyrienskies.core.util.x
 import org.valkyrienskies.core.util.y
 import org.valkyrienskies.core.util.z
+import org.valkyrienskies.mod.common.dimensionId
 import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.util.toJOML
 import org.valkyrienskies.mod.common.util.toJOMLD
@@ -96,8 +97,12 @@ object VSCommands {
                                     val r = ShipArgument.getShips(it, "ships").toList() as List<ServerShip>
                                     val position =
                                         Vec3Argument.getVec3(it as CommandContext<CommandSourceStack>, "position")
+                                    val dimensionId = (it.source as CommandSourceStack).level.dimensionId
                                     val shipTeleportData: ShipTeleportData =
-                                        ShipTeleportDataImpl(newPos = position.toJOML())
+                                        ShipTeleportDataImpl(
+                                            newPos = position.toJOML(),
+                                            newDimension = dimensionId
+                                        )
                                     r.forEach { ship ->
                                         vsCore.teleportShip(
                                             (it as CommandContext<VSCommandSource>).source.shipWorld as ServerShipWorld,
@@ -125,12 +130,14 @@ object VSCommands {
                                             )
 
                                         val source = it.source as CommandSourceStack
+                                        val dimensionId = (it.source as CommandSourceStack).level.dimensionId
                                         val shipTeleportData: ShipTeleportData =
                                             ShipTeleportDataImpl(
                                                 newPos = position.toJOML(),
                                                 newRot = eulerAngles.toEulerRotationFromMCEntity(
                                                     source.rotation.x.toDouble(), source.rotation.y.toDouble(),
-                                                )
+                                                ),
+                                                newDimension = dimensionId
                                             )
                                         r.forEach { ship ->
                                             vsCore.teleportShip(
@@ -164,13 +171,15 @@ object VSCommands {
                                             )
 
                                             val source = it.source as CommandSourceStack
+                                            val dimensionId = (it.source as CommandSourceStack).level.dimensionId
                                             val shipTeleportData: ShipTeleportData =
                                                 ShipTeleportDataImpl(
                                                     newPos = position.toJOML(),
                                                     newRot = eulerAngles.toEulerRotationFromMCEntity(
                                                         source.rotation.x.toDouble(), source.rotation.y.toDouble(),
                                                     ),
-                                                    newVel = velocity.toVector3d(0.0, 0.0, 0.0)
+                                                    newVel = velocity.toVector3d(0.0, 0.0, 0.0),
+                                                    newDimension = dimensionId
                                                 )
                                             r.forEach { ship ->
                                                 vsCore.teleportShip(
@@ -209,14 +218,16 @@ object VSCommands {
                                                 )
 
                                                 val source = it.source as CommandSourceStack
+                                                val dimensionId = (it.source as CommandSourceStack).level.dimensionId
                                                 val shipTeleportData: ShipTeleportData =
                                                     ShipTeleportDataImpl(
                                                         newPos = position.toJOML(),
                                                         newRot = eulerAngles.toEulerRotationFromMCEntity(
                                                             source.rotation.x.toDouble(), source.rotation.y.toDouble(),
                                                         ),
                                                         newVel = velocity.toVector3d(0.0, 0.0, 0.0),
-                                                        newOmega = angularVelocity.toVector3d(0.0, 0.0, 0.0)
+                                                        newOmega = angularVelocity.toVector3d(0.0, 0.0, 0.0),
+                                                        newDimension = dimensionId
                                                     )
                                                 r.forEach { ship ->
                                                     vsCore.teleportShip(