PlayerTeleporter: immediately throw if teleport target world is null,…

… rather than confusing downstream mc error
John-Paul-R · Jun 21, 2024 · 98cbdda · 98cbdda
1 parent a0f8dca
commit 98cbdda
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/PlayerTeleporter.java b/src/main/java/com/fibermc/essentialcommands/teleportation/PlayerTeleporter.java
@@ -58,8 +58,12 @@ public static void teleport(PlayerData pData, MinecraftLocation dest, MutableTex
     }
 
     private static void execTeleport(ServerPlayerEntity playerEntity, MinecraftLocation dest, MutableText destName) {
+        var targetWorld = playerEntity.getServer().getWorld(dest.dim());
+        if (targetWorld == null) {
+            throw new NullPointerException(String.format("Could not find teleport target world, '%s'", dest.dim()));
+        }
         playerEntity.teleport(
-            playerEntity.getServer().getWorld(dest.dim()),
+            targetWorld,
             dest.pos().x, dest.pos().y, dest.pos().z,
             dest.headYaw(), dest.pitch()
         );