Ensure player is dismounted before teleport, fix #496

WiIIiam278 · Sep 25, 2023 · 2145d69 · 2145d69
1 parent e579b2b
commit 2145d69
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/bukkit/src/main/java/net/william278/huskhomes/user/BukkitUser.java b/bukkit/src/main/java/net/william278/huskhomes/user/BukkitUser.java
@@ -136,6 +136,7 @@ public void teleportLocally(@NotNull Location location, boolean async) throws Te
         // Run on the appropriate thread scheduler for this platform
         plugin.getScheduler().entitySpecificScheduler(player).run(
                 () -> {
+                    player.leaveVehicle();
                     if (async || plugin.getScheduler().isUsingFolia()) {
                         PaperLib.teleportAsync(player, bukkitLocation, PlayerTeleportEvent.TeleportCause.PLUGIN);
                         return;

diff --git a/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java b/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java
@@ -131,6 +131,7 @@ public void teleportLocally(@NotNull Location location, boolean async) throws Te
             throw new TeleportationException(TeleportationException.Type.ILLEGAL_TARGET_COORDINATES, plugin);
         }
 
+        player.dismountVehicle();
         FabricDimensions.teleport(
                 player,
                 server.getWorld(server.getWorldRegistryKeys().stream()

diff --git a/sponge/src/main/java/net/william278/huskhomes/user/SpongeUser.java b/sponge/src/main/java/net/william278/huskhomes/user/SpongeUser.java
@@ -113,6 +113,7 @@ public void teleportLocally(@NotNull Location location, boolean async) {
             if (serverLocation.isEmpty()) {
                 return;
             }
+            player.vehicle().ifPresent(vehicle -> vehicle.get().passengers().remove(player));
             player.setLocation(serverLocation.get());
         });
     }