Merge pull request #7 from Kooperlol/1.1.2

1.1.2

Author: Kooperlol

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'codes.kooper'
-version = '1.1.0-beta'
+version = '1.1.2-beta'
 
 dependencies {
     implementation 'org.projectlombok:lombok:1.18.28'

src/main/java/codes/kooper/blockify/Blockify.java

@@ -13,7 +13,6 @@
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import lombok.Getter;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitTask;
 
 @Getter
 public final class Blockify extends JavaPlugin {
@@ -48,8 +47,6 @@ public void onEnable() {
     @Override
     public void onDisable() {
         getLogger().info("Blockify has been disabled!");
-        blockChangeManager.getBlockChangeTasks().values().forEach(BukkitTask::cancel);
-        PacketEvents.getAPI().terminate();
     }
 
     public static Blockify getInstance() {

src/main/java/codes/kooper/blockify/managers/BlockChangeManager.java

@@ -25,13 +25,11 @@
 
 @Getter
 public class BlockChangeManager {
-
     private final ConcurrentHashMap<Player, BukkitTask> blockChangeTasks;
     private final ConcurrentHashMap<BlockData, Integer> blockDataToId;
 
     public BlockChangeManager() {
         this.blockChangeTasks = new ConcurrentHashMap<>();
-        //this.chunksBeingSent = new ConcurrentHashMap<>();
         this.blockDataToId = new ConcurrentHashMap<>();
     }
 

src/main/java/codes/kooper/blockify/models/Audience.java

@@ -57,7 +57,7 @@ public Set<Player> removePlayer(Player player) {
      * @param speed The speed
      */
     public void setMiningSpeed(Player player, float speed) {
-        if (speed <= 0 || speed == 1) {
+        if (speed < 0 || speed == 1) {
             Blockify.getInstance().getLogger().warning("Invalid mining speed for player " + player + ": " + speed);
             return;
         }

src/main/java/codes/kooper/blockify/models/Stage.java

@@ -71,7 +71,6 @@ public void sendBlocksToAudience() {
      * @param blocks Blocks to refresh to the audience.
      */
     public void refreshBlocksToAudience(Set<BlockifyPosition> blocks) {
-        Blockify.getInstance().getLogger().info("Refresh with size " + blocks.size());
         ConcurrentHashMap<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> blockChanges = new ConcurrentHashMap<>();
         for (View view : views) {
             for (BlockifyPosition position : blocks) {

src/main/java/codes/kooper/blockify/utils/MiningUtils.java

@@ -62,10 +62,14 @@ public void handleCustomDigging(Player player, View view, DiggingAction actionTy
             return;
         }
 
-        // Check if player can instantly break block (CREATIVE)
-        if (actionType == DiggingAction.START_DIGGING && player.getGameMode() == GameMode.CREATIVE) {
+        // Check if player can instantly break block (CREATIVE) or if mining speed is 0
+        if (actionType == DiggingAction.START_DIGGING && (player.getGameMode() == GameMode.CREATIVE || view.getStage().getAudience().getMiningSpeed(player) == 0)) {
             actionType = DiggingAction.FINISHED_DIGGING;
             blockStages.get(position).setStage((byte) 9);
+            if (view.getStage().getAudience().getMiningSpeed(player) == 0) {
+                WrapperPlayServerBlockBreakAnimation wrapperPlayServerBlockBreakAnimation = new WrapperPlayServerBlockBreakAnimation(new Random().nextInt(999999999) + 1000, new Vector3i(position.getX(), position.getY(), position.getZ()), (byte) 9);
+                PacketEvents.getAPI().getPlayerManager().sendPacket(player, wrapperPlayServerBlockBreakAnimation);
+            }
         }
 
         // Block break functionality
@@ -143,6 +147,7 @@ public void updateBlockStage(Player player, BlockifyPosition position, BlockData
             }
         }
         // Send block break animation packet
+        if (blockStages.get(position) == null || blockStages.get(position).getStage() >= 9) return;
         WrapperPlayServerBlockBreakAnimation wrapperPlayServerBlockBreakAnimation = new WrapperPlayServerBlockBreakAnimation(new Random().nextInt(999999999) + 1000, new Vector3i(position.getX(), position.getY(), position.getZ()), blockStages.get(position).getStage());
         PacketEvents.getAPI().getPlayerManager().sendPacket(player, wrapperPlayServerBlockBreakAnimation);
     }

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: Blockify
-version: '1.1.0-beta'
+version: '1.1.2-beta'
 main: codes.kooper.blockify.Blockify
 api-version: '1.20'
 depend: