From d0d975f0d9a811b8eec38605897ca3c245781078 Mon Sep 17 00:00:00 2001 From: TehBrian Date: Thu, 26 Oct 2023 21:08:39 -0400 Subject: [PATCH] protect world spawn column rather than bubble this will help prevent vertical grief --- .../floatyplugin/realm/SpawnProtectionListener.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/city/thefloating/floatyplugin/realm/SpawnProtectionListener.java b/src/main/java/city/thefloating/floatyplugin/realm/SpawnProtectionListener.java index 7c5b1a4..444029f 100644 --- a/src/main/java/city/thefloating/floatyplugin/realm/SpawnProtectionListener.java +++ b/src/main/java/city/thefloating/floatyplugin/realm/SpawnProtectionListener.java @@ -78,7 +78,7 @@ public void onInteract(final PlayerInteractEvent event) { @EventHandler(priority = EventPriority.LOW) public void onEntityDamageByEntity(final EntityDamageByEntityEvent event) { - if (event.getDamager() instanceof Player player) { + if (event.getDamager() instanceof final Player player) { this.handle(event, player, event.getEntity().getLocation()); } } @@ -151,8 +151,11 @@ private void handle( } private boolean isWithinWorldSpawn(final Location location) { - final Location worldSpawn = location.getWorld().getSpawnLocation(); - return location.distanceSquared(worldSpawn) < SPAWN_PROTECTION_RADIUS_SQUARED; + final Location loc1 = location.clone(); + loc1.setY(0); + final Location loc2 = location.getWorld().getSpawnLocation(); + loc2.setY(0); + return loc1.distanceSquared(loc2) < SPAWN_PROTECTION_RADIUS_SQUARED; } }