Fix /spawn not working

Author: Kenny-Hui

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	fabric_version=0.92.2+1.20.1
 
 # Mod Properties
-	mod_version = 2.0.0
+	mod_version = 2.0.1
 	maven_group = com.lx862.svrutil
 	archives_base_name = svrutil
 

src/main/java/com/lx862/svrutil/commands/spawn.java

@@ -9,9 +9,11 @@
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 public class spawn {
     private static final CommandEntry defaultEntry = new CommandEntry("spawn", 0, true);
@@ -30,15 +32,18 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
     }
 
     public static int execute(CommandContext<ServerCommandSource> context, ServerPlayerEntity player, boolean personal) throws CommandSyntaxException {
-        BlockPos spawnPoint = null;
+        final ServerWorld dimension;
+        final BlockPos spawnPoint;
         if(personal) {
             spawnPoint = player.getSpawnPointPosition();
-        }
-        if(spawnPoint == null) {
+            dimension = context.getSource().getServer().getWorld(player.getSpawnPointDimension());
+        } else {
             spawnPoint = context.getSource().getWorld().getSpawnPos();
+            dimension = context.getSource().getWorld();
         }
 
-        player.requestTeleportAndDismount(spawnPoint.getX(), spawnPoint.getY(), spawnPoint.getZ());
+        player.dismountVehicle();
+        player.requestTeleport(spawnPoint.getX(), spawnPoint.getY(), spawnPoint.getZ());
         context.getSource().sendFeedback(() -> Text.literal("Teleported back to spawn.").formatted(Formatting.GREEN), false);
         Commands.finishedExecution(context, defaultEntry);
         return 1;