Merge pull request #150 from LewMC/issue-145

Issue #145
LewMC · Aug 6, 2024 · 6d61d88 · 6d61d88
2 parents 243355d + 9f624e6
commit 6d61d88
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>net.lewmc</groupId>
   <artifactId>essence</artifactId>
   <name>Essence</name>
-  <version>1.7.0</version>
+  <version>1.7.1-SNAPSHOT</version>
   <build>
     <resources>
       <resource>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.lewmc</groupId>
     <artifactId>essence</artifactId>
-    <version>1.7.0</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Essence</name>

diff --git a/src/main/java/net/lewmc/essence/events/RespawnEvent.java b/src/main/java/net/lewmc/essence/events/RespawnEvent.java
@@ -28,6 +28,7 @@ public RespawnEvent(Essence plugin) {
      */
     @EventHandler
     public void onPlayerRespawn(PlayerRespawnEvent event) {
+        LogUtil log = new LogUtil(this.plugin);
         MessageUtil message = new MessageUtil(event.getPlayer(), this.plugin);
 
         FileUtil config = new FileUtil(this.plugin);
@@ -46,7 +47,7 @@ public void onPlayerRespawn(PlayerRespawnEvent event) {
             TeleportUtil tp = new TeleportUtil(plugin);
             tp.doTeleport(
                     event.getPlayer(),
-                    Bukkit.getServer().getWorld("user.last-sleep-location.world"),
+                    Bukkit.getServer().getWorld(playerData.getString("user.last-sleep-location.world")),
                     playerData.getDouble("user.last-sleep-location.X"),
                     playerData.getDouble("user.last-sleep-location.Y"),
                     playerData.getDouble("user.last-sleep-location.Z"),
@@ -64,7 +65,6 @@ public void onPlayerRespawn(PlayerRespawnEvent event) {
         spawns.load("data/spawns.yml");
 
         if (spawns.get("spawn."+spawnName) == null) {
-            LogUtil log = new LogUtil(this.plugin);
             if (
                 Bukkit.getServer().getWorld(spawnName).getSpawnLocation() != null &&
                 Bukkit.getServer().getWorld(spawnName).getSpawnLocation().getY() >= 10

diff --git a/src/main/java/net/lewmc/essence/utils/TeleportUtil.java b/src/main/java/net/lewmc/essence/utils/TeleportUtil.java
@@ -167,9 +167,10 @@ public void doTeleport(Player player, Location location, int delay) {
         FoliaLib flib = new FoliaLib(this.plugin);
         MessageUtil message = new MessageUtil(player, this.plugin);
         if (location.getWorld() == null) {
-            message.send("generic","exception");
+            message.send("teleport","exception");
             this.log.severe("Unable to locate world in universe.");
             this.log.severe("Details: {\"error\": \"WORLD_IS_NULL\", \"caught\": \"TeleportUtil.java\", \"submitted\": \"null\", \"found\": \"null\"}.");
+            this.log.severe("Location: "+location);
             return;
         }
 

diff --git a/src/main/resources/language/en-GB.yml b/src/main/resources/language/en-GB.yml
@@ -178,6 +178,7 @@ teleport:
   requestsdisabled: "§4[Essence] §c{{1}} has teleportation requests disabled."
   movetocancel: "§6[Essence] §eMove to cancel teleportation."
   cancelled: "§4[Essence] §cTeleportation cancelled."
+  exception: "§4[Essence] §cEssence encountered an issue whilst trying to process this teleportation, please see console for details."
 feed:
   fed: "§2[Essence] §aYou fed {{1}}."
   serverfed: "§2[Essence] §aYou've been fed by a magical force."