KnarCraft/Launchpad
KnarCraft/Launchpad
1
0
Fork 0
mirror of https://github.com/SunNetservers/Launchpad.git synced 2024-12-05 01:43:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decreases hit-box for solid block launchpads

Browse Source
This commit is contained in:
Kristian Knarvik 2023-06-30 16:06:43 +02:00
parent 394631c560
commit c90e3e9a73
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/knarcraft/launchpad/listener/LaunchpadUseListener.java
View File

@ -4,6 +4,7 @@ import net.knarcraft.launchpad.Launchpad;
import net.knarcraft.launchpad.config.LaunchpadConfiguration; import net.knarcraft.launchpad.config.LaunchpadConfiguration;
import net.knarcraft.launchpad.launchpad.LaunchpadBlock; import net.knarcraft.launchpad.launchpad.LaunchpadBlock;
import net.knarcraft.launchpad.launchpad.LaunchpadBlockHandler; import net.knarcraft.launchpad.launchpad.LaunchpadBlockHandler;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Tag; import org.bukkit.Tag;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -44,7 +45,7 @@ public class LaunchpadUseListener implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onMove(PlayerMoveEvent event) { 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; return;
} }
@ -52,7 +53,7 @@ public class LaunchpadUseListener implements Listener {
// block below has to be checked instead. // block below has to be checked instead.
Block block = event.getTo().getBlock(); Block block = event.getTo().getBlock();
if (block.getType().isAir()) { 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 // Only trigger hit detection for passable blocks if the player is in the block
if (block.isPassable()) { if (block.isPassable()) {
return; return;
@ -123,4 +124,16 @@ public class LaunchpadUseListener implements Listener {
player.setVelocity(direction); 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();
}
} }