Fixed a very stubborn glitch ;(

OJASisLive · Jul 29, 2024 · eeed280 · eeed280
1 parent e9c5f29
commit eeed280
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 15 deletions.
diff --git a/src/main/java/me/ojasislive/blockdropminigame/game/mechanics/BlockMechanics.java b/src/main/java/me/ojasislive/blockdropminigame/game/mechanics/BlockMechanics.java
@@ -37,6 +37,20 @@ public void blockChange(Player player, Location toLocation, Plugin plugin){
             b.setType(Material.ORANGE_CONCRETE);
             Bukkit.getScheduler().runTaskLater(plugin, () -> b.setType(Material.RED_CONCRETE), 20L);
             Bukkit.getScheduler().runTaskLater(plugin, () -> b.setType(Material.AIR), 30L);
+            Bukkit.getScheduler().runTaskLater(plugin, () -> blocks.remove(b),31L);
+        }, 20L);
+    }
+    public void blockChange(Player player, Block b, Plugin plugin){
+        if (blocks.contains(b)) return;
+        if(b.getType()== Material.AIR) return;
+        player.playSound(player.getLocation(), Sound.BLOCK_STONE_PLACE,1f,1f);
+        blocks.add(b);
+        b.setType(Material.YELLOW_CONCRETE);
+        Bukkit.getScheduler().runTaskLater(plugin, () -> {
+            b.setType(Material.ORANGE_CONCRETE);
+            Bukkit.getScheduler().runTaskLater(plugin, () -> b.setType(Material.RED_CONCRETE), 20L);
+            Bukkit.getScheduler().runTaskLater(plugin, () -> b.setType(Material.AIR), 30L);
+            Bukkit.getScheduler().runTaskLater(plugin, () -> blocks.remove(b),31L);
         }, 20L);
     }
 

diff --git a/src/main/java/me/ojasislive/blockdropminigame/listeners/PlayerMovementListener.java b/src/main/java/me/ojasislive/blockdropminigame/listeners/PlayerMovementListener.java
@@ -7,50 +7,89 @@
 import me.ojasislive.blockdropminigame.game.GameStateHandler;
 import me.ojasislive.blockdropminigame.game.PlayerCache;
 import me.ojasislive.blockdropminigame.game.mechanics.BlockMechanics;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.util.Vector;
+
+import java.util.HashSet;
+import java.util.Set;
 
 public class PlayerMovementListener implements Listener {
 
+    private static Set<Block> getBlocksPlayerIsStandingOn(Player player) {
+        Set<Block> blocks = new HashSet<>();
+
+        // Get the player's current location
+        Location playerLocation = player.getLocation();
+        double playerX = playerLocation.getX();
+        double playerY = playerLocation.getY();
+        double playerZ = playerLocation.getZ();
+
+        // Player's bounding box width (assume player width is 0.6 blocks)
+        double playerWidth = 0.6;
+
+        // Calculate the corner points of the player's bounding box at foot level
+        Vector minCorner = new Vector(playerX - playerWidth / 2, playerY - 0.1, playerZ - playerWidth / 2);
+        Vector maxCorner = new Vector(playerX + playerWidth / 2, playerY - 0.1, playerZ + playerWidth / 2);
+
+        // Loop through each block in the bounding box
+        for (double x = Math.floor(minCorner.getX()); x <= Math.floor(maxCorner.getX()); x++) {
+            for (double z = Math.floor(minCorner.getZ()); z <= Math.floor(maxCorner.getZ()); z++) {
+                Block block = player.getWorld().getBlockAt(new Location(player.getWorld(), x, Math.floor(playerY - 0.1), z));
+                if (block.getType() != Material.AIR) {
+                    blocks.add(block);
+                }
+            }
+        }
+
+        return blocks;
+    }
+
     Plugin plugin = Blockdropminigame.getInstance();
+
     @EventHandler
-    public void onPlayerMove(PlayerMoveEvent event){
+    public void onPlayerMove(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         Location toLocation = event.getTo();
-        if(!(toLocation == null)) {
+        if (!(toLocation == null)) {
 
             if (!PlayerCache.getJoinedPlayers().containsKey(player.getUniqueId().toString())) return;
             String arenaName = PlayerCache.getJoinedPlayers().get(player.getUniqueId().toString());
             Arena arena = ArenaUtils.getArenaByName(arenaName);
-            if (arena != null){
-                if(arena.getState().equals(ArenaState.STARTING) & !event.getFrom().getBlock().equals(event.getTo().getBlock())) event.setCancelled(true);
-                if(arena.getState() != ArenaState.RUNNING) return;
-                if (!ArenaUtils.isInRegion(toLocation,arena)) {
-                    if(arena.getMinLocation().getY()+1>=toLocation.getY()){
+            if (arena != null) {
+                if (arena.getState().equals(ArenaState.STARTING) & !event.getFrom().getBlock().equals(event.getTo().getBlock()))
+                    event.setCancelled(true);
+                if (arena.getState() != ArenaState.RUNNING) return;
+                if (!ArenaUtils.isInRegion(toLocation, arena)) {
+                    if (arena.getMinLocation().getY() + 1 >= toLocation.getY()) {
                         PlayerCache.removeJoinedPlayers(player.getUniqueId().toString());
-                        player.sendMessage(ChatColor.RED+"You're out!");
+                        player.sendMessage(ChatColor.RED + "You're out!");
                         arena.addEliminatedPlayers(player.getUniqueId().toString());
                         arena.getPlayers().remove(player.getUniqueId().toString());
-                        if(arena.getPlayers().size()==0){
+                        if (arena.getPlayers().size() == 0) {
                             GameStateHandler.getInstance().gameEnder(arena);
                         }
 
                     }
-                }else {
+                } else {
+                    //BlockMechanics.getInstance().blockChange(player, toLocation, plugin);
 
-                    BlockMechanics.getInstance().blockChange(player,toLocation,plugin);
+                    Bukkit.getScheduler().runTaskLater(plugin, () -> {
+                        Set<Block> blocksBelowPlayer = getBlocksPlayerIsStandingOn(player);
+                        for (Block block : blocksBelowPlayer) {
+                            BlockMechanics.getInstance().blockChange(player, block, plugin);
+                        }} ,1L);
 
                 }
-
             }
-
-
         }
-
     }
 }