From 57fcce0ef94c97700eb6bae15d7edfe64036716e Mon Sep 17 00:00:00 2001
From: Percyqaz <>
Date: Mon, 20 Dec 2021 02:16:32 +0000
Subject: [PATCH] fixed bugs, added sounds and particles

---
 .idea/workspace.xml                            | 16 +++++++++++-----
 src/me/Percyqaz/Lodestone/CompassListener.java | 12 ++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9b53ba..064bc09 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="dadfd0bd-7026-47d8-9092-b5573d007536" name="Default Changelist" comment="added cooldown and warmup times">
+    <list default="true" id="dadfd0bd-7026-47d8-9092-b5573d007536" name="Default Changelist" comment="added configurable cooldown and warmup times">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/me/Percyqaz/Lodestone/CompassListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/me/Percyqaz/Lodestone/CompassListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/me/Percyqaz/Lodestone/Lodestone.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/me/Percyqaz/Lodestone/Lodestone.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugin.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -68,7 +66,14 @@
       <option name="project" value="LOCAL" />
       <updated>1626271207819</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="added configurable cooldown and warmup times">
+      <created>1639964456629</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1639964456629</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -86,6 +91,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="update to 1.17.1" />
     <MESSAGE value="added cooldown and warmup times" />
-    <option name="LAST_COMMIT_MESSAGE" value="added cooldown and warmup times" />
+    <MESSAGE value="added configurable cooldown and warmup times" />
+    <option name="LAST_COMMIT_MESSAGE" value="added configurable cooldown and warmup times" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/me/Percyqaz/Lodestone/CompassListener.java b/src/me/Percyqaz/Lodestone/CompassListener.java
index ee67939..14dbb95 100644
--- a/src/me/Percyqaz/Lodestone/CompassListener.java
+++ b/src/me/Percyqaz/Lodestone/CompassListener.java
@@ -61,9 +61,10 @@ int checkPlayerCooldown(String name)
     void PerformTeleport(Player player, Location oldLoc)
     {
         // Need to check player hasn't moved, is still holding a teleport compass
-        if (player.getLocation().distanceSquared(oldLoc) > 0 && !player.isDead())
+        if (player.getLocation().distance(oldLoc) > 0.1 || player.isDead())
         {
             player.sendMessage(config.getString("teleportFailedMovedBeforeTeleport"));
+            player.playSound(player.getLocation(), Sound.ITEM_LODESTONE_COMPASS_LOCK, 1.0f, 0.5f);
             resetPlayerCooldown(player.getName());
             return;
         }
@@ -79,18 +80,20 @@ void PerformTeleport(Player player, Location oldLoc)
                                 ? config.getString("teleportSucceededNamedLocation").replace("%location%", itemMeta.getDisplayName())
                                 : config.getString("teleportSucceeded");
                 player.sendMessage(teleportMessage);
-                player.spawnParticle(Particle.CLOUD, oldLoc.add(0.0f, 1.0f, 0.0f), 50);
+                player.spawnParticle(Particle.CLOUD, oldLoc.add(0.0f, 1.0f, 0.0f), 50, 0.5f, 1.0f, 0.5f, 0.01f);
 
                 Location pos = itemMeta.getLodestone();
                 player.teleport(pos.add(0.5, 1.5, 0.5));
                 item.setAmount(item.getAmount() - 1);
 
-                player.spawnParticle(Particle.CLOUD, player.getLocation().add(0.0f, 1.0f, 0.0f), 50);
+                player.spawnParticle(Particle.CLOUD, player.getLocation().add(0.0f, 1.0f, 0.0f), 50, 0.5f, 1.0f, 0.5f, 0.01f);
+                player.playSound(player.getLocation(), Sound.BLOCK_CONDUIT_ACTIVATE, 1.0f, 0.5f);
                 return;
             }
         }
 
         player.sendMessage(config.getString("teleportFailedCompassNotInHand"));
+        player.playSound(oldLoc, Sound.ITEM_LODESTONE_COMPASS_LOCK, 1.0f, 0.5f);
         resetPlayerCooldown(player.getName());
     }
 
@@ -117,7 +120,8 @@ Boolean handlePlayerClickCompass(Player player, ItemStack item)
                     () -> PerformTeleport(player, oldLoc),
                     warmupTimeTicks
             );
-            player.spawnParticle(Particle.ENCHANTMENT_TABLE, oldLoc.add(0.0f, 1.0f, 0.0f), 50);
+            player.spawnParticle(Particle.ENCHANTMENT_TABLE, player.getLocation().add(0.0f, 1.0f, 0.0f), 50);
+            player.playSound(player.getLocation(), Sound.ITEM_LODESTONE_COMPASS_LOCK, 1.0f, 1.5f);
             return true;
         }
         return false;