From 74c715fc40cf377bdf28fe338e0696f7a54b37a6 Mon Sep 17 00:00:00 2001 From: Thatsmusic99 <25277367+thatsmusic99@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:58:14 +0100 Subject: [PATCH] fix: use current location rather than previous location when respawning --- .../managers/TeleportTrackingManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java index 340a5cf0..fa6bd5a8 100644 --- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java +++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java @@ -91,15 +91,12 @@ public void onDeath(PlayerDeathEvent e) { @EventHandler(priority = EventPriority.HIGHEST) public void onRespawn(PlayerRespawnEvent e) { if (e.getPlayer().hasMetadata("NPC")) return; - CoreClass.debug("Respawn event triggered for " + e.getPlayer().getName() + "."); - ATPlayer atPlayer = ATPlayer.getPlayer(e.getPlayer()); + Location location = e.getPlayer().getLocation(); + CoreClass.debug("Respawn event triggered for " + e.getPlayer().getName() + ". Location: " + location); if (NewConfig.get().USE_SPAWN.get()) { CoreClass.debug("Spawning feature is enabled."); - if (atPlayer.getPreviousLocation() == null) return; - if (atPlayer.getPreviousLocation().getWorld() == null) return; - CoreClass.debug("Player has a previous location to go back to."); ConfigSection deathManagement = NewConfig.get().DEATH_MANAGEMENT.get(); - String spawnCommand = deathManagement.getString(atPlayer.getPreviousLocation().getWorld().getName()); + String spawnCommand = deathManagement.getString(location.getWorld().getName()); if (spawnCommand == null || spawnCommand.equals("{default}")) { spawnCommand = deathManagement.getString("default"); if (spawnCommand == null) return;