fix self place

xGinko · Jan 24, 2024 · be3b9ca · be3b9ca
1 parent ed58c31
commit be3b9ca
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/...yExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/combat/Burrow.java b/...yExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/combat/Burrow.java
@@ -15,6 +15,7 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 
 public class Burrow implements AnarchyExploitFixesModule, Listener {
@@ -66,12 +67,21 @@ private void teleportUpAndCenter(Player player, Location from) {
         player.teleport(from.clone().add(0.5, 1, 0.5));
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    private void onSelfPlace(BlockPlaceEvent event) {
+        final Location blockLoc = event.getBlock().getLocation();
+        Location legsLoc = event.getPlayer().getLocation().toBlockLocation();
+        if (legsLoc.equals(blockLoc) || legsLoc.add(0, 1, 0).equals(blockLoc)) {
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onPlayerMove(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         if (!player.getGameMode().equals(GameMode.SURVIVAL)) return;
         if (player.isInsideVehicle() || player.isGliding()) return;
-        
+
         final Location playerLocation = player.getLocation();
         final Block burrowBlock = playerLocation.getBlock();
         final Material burrowMaterial = burrowBlock.getType();

diff --git a/...ExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/modules/combat/Burrow.java b/...ExploitFixesLegacy/src/main/java/me/moomoo/anarchyexploitfixes/modules/combat/Burrow.java
@@ -14,6 +14,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 
 import java.util.Arrays;
@@ -87,6 +88,15 @@ private void teleportUpAndCenter(Player player, Location from) {
          player.teleport(from.clone().add(0.5, 1, 0.5));
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    private void onSelfPlace(BlockPlaceEvent event) {
+        final Location blockLoc = event.getBlock().getLocation();
+        Location legsLoc = event.getPlayer().getLocation().toBlockLocation();
+        if (legsLoc.equals(blockLoc) || legsLoc.add(0, 1, 0).equals(blockLoc)) {
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onPlayerMove(PlayerMoveEvent event) {
         Player player = event.getPlayer();