diff --git a/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java b/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java index 1a33f97..32e65b4 100644 --- a/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java +++ b/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java @@ -1,9 +1,9 @@ package net.islandearth.rpgregions.requirements; import io.papermc.lib.PaperLib; +import org.bukkit.Particle; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.util.Vector; public enum PreventType { TELEPORT, @@ -16,9 +16,9 @@ public enum PreventType { PaperLib.teleportAsync(player, event.getFrom()); break; case PUSH: - Vector vector = event.getTo().toVector().subtract(player.getLocation().toVector()).normalize(); - player.setVelocity(vector.multiply(0.5)); + player.setVelocity(event.getTo().toVector().subtract(event.getFrom().toVector()).multiply(-3)); break; } + player.spawnParticle(Particle.BARRIER, event.getTo().getBlock().getLocation().add(0.5, 0.5, 0.5), 1); } } diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/MoveListener.java b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/MoveListener.java index 05344ca..a7dc9cb 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/MoveListener.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/MoveListener.java @@ -15,12 +15,6 @@ public class MoveListener implements Listener { @EventHandler public void onMove(PlayerMoveEvent pme) { - int x = pme.getTo().getBlockX(); - int z = pme.getTo().getBlockZ(); - int oldX = pme.getFrom().getBlockX(); - int oldZ = pme.getFrom().getBlockZ(); - if (x == oldX && z == oldZ) return; - plugin.getManagers().getIntegrationManager().handleMove(pme); } } \ No newline at end of file