From c90e3e9a737cbbe1330093e55df1c6e4dde50980 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Fri, 30 Jun 2023 16:06:43 +0200
Subject: [PATCH] Decreases hit-box for solid block launchpads

---
 .../listener/LaunchpadUseListener.java          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/knarcraft/launchpad/listener/LaunchpadUseListener.java b/src/main/java/net/knarcraft/launchpad/listener/LaunchpadUseListener.java
index 76ce2eb..f6cd219 100644
--- a/src/main/java/net/knarcraft/launchpad/listener/LaunchpadUseListener.java
+++ b/src/main/java/net/knarcraft/launchpad/listener/LaunchpadUseListener.java
@@ -4,6 +4,7 @@ import net.knarcraft.launchpad.Launchpad;
 import net.knarcraft.launchpad.config.LaunchpadConfiguration;
 import net.knarcraft.launchpad.launchpad.LaunchpadBlock;
 import net.knarcraft.launchpad.launchpad.LaunchpadBlockHandler;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Tag;
 import org.bukkit.block.Block;
@@ -44,7 +45,7 @@ public class LaunchpadUseListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onMove(PlayerMoveEvent event) {
-        if (event.getTo() == null || event.getFrom().getBlock().equals(event.getTo().getBlock())) {
+        if (event.getTo() == null || isSameLocation(event.getFrom(), event.getTo())) {
             return;
         }
 
@@ -52,7 +53,7 @@ public class LaunchpadUseListener implements Listener {
         // block below has to be checked instead.
         Block block = event.getTo().getBlock();
         if (block.getType().isAir()) {
-            block = block.getRelative(BlockFace.DOWN);
+            block = event.getTo().clone().subtract(0, 0.2, 0).getBlock();
             // Only trigger hit detection for passable blocks if the player is in the block
             if (block.isPassable()) {
                 return;
@@ -123,4 +124,16 @@ public class LaunchpadUseListener implements Listener {
         player.setVelocity(direction);
     }
 
+    /**
+     * Checks if two locations are the same, excluding rotation
+     *
+     * @param location1 <p>The first location to check</p>
+     * @param location2 <p>The second location to check</p>
+     * @return <p>True if the locations are the same, excluding rotation</p>
+     */
+    private boolean isSameLocation(Location location1, Location location2) {
+        return location1.getX() == location2.getX() && location1.getY() == location2.getY() &&
+                location1.getZ() == location2.getZ();
+    }
+
 }