Fix: Fixed generate command duping zones

.gitignore

@@ -116,3 +116,4 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+/.idea/

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'net.pldyn'
-version = '1.0.0-beta.2'
+version = '1.0.0-beta.3'
 
 repositories {
     mavenCentral()

src/main/java/net/pldyn/bluemapzones/BlueMap_Zones.java

@@ -10,7 +10,7 @@
 import java.util.Objects;
 import java.util.logging.Logger;
 
-public final class BlueMap_Zones extends JavaPlugin implements ZoneGenerationCallback {
+public final class BlueMap_Zones extends JavaPlugin {
 
   private static final Logger Log = Logger.getLogger("BM Zones");
   private java.util.UUID UUID;
@@ -70,25 +70,25 @@ private void doInit(BlueMapAPI blueMapAPI) {
     Log.info("Plugin initialized!");
   }
 
-  @Override
-  public void onZoneGenerationComplete(ArrayList<ZonedShape> zonedShapes) {
-    runningGeneration = false;
-    setZonedShapes(zonedShapes);
-    Log.info("Zone generation complete!");
-    Log.info("Generated " + zonedShapes.size() + " zones.");
-
-    movementHandler.setZonedShapes( zonedShapes );
-  }
+//  @Override
+//  public void onZoneGenerationComplete(ArrayList<ZonedShape> zonedShapes) {
+//    runningGeneration = false;
+//    setZonedShapes(zonedShapes);
+//    Log.info("Zone generation complete!");
+//    Log.info("Generated " + zonedShapes.size() + " zones.");
+//  }
 
   public void generateZones() {
+    zonedShapes.clear();
     runningGeneration = true;
-    new ZoneGenerator(bma, this, this).start();
+    new ZoneGenerator(bma, this).start();
     Log.info("Zone generation started!");
   }
 
   public void setZonedShapes(ArrayList<ZonedShape> zonedShapes) {
     this.zonedShapes.clear();
     this.zonedShapes = zonedShapes;
+    movementHandler.setZonedShapes( zonedShapes );
   }
 
   public BlueMapAPI getBlueMapAPI() {

src/main/java/net/pldyn/bluemapzones/ZoneGenerator.java

@@ -7,7 +7,10 @@
 import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.api.markers.ShapeMarker;
 import de.bluecolored.bluemap.api.math.Shape;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 import java.util.*;
 import java.util.logging.Logger;
@@ -19,12 +22,10 @@ public class ZoneGenerator extends Thread {
   private static final ArrayList<ZonedShape> zonedShapes = new ArrayList<>();
   private final BlueMapAPI blueMapAPI;
   private final BlueMap_Zones plugin;
-  private final ZoneGenerationCallback callback;
 
-  public ZoneGenerator(BlueMapAPI blueMapApi, BlueMap_Zones plugin, ZoneGenerationCallback callback) {
+  public ZoneGenerator(BlueMapAPI blueMapApi, BlueMap_Zones plugin) {
     this.blueMapAPI = blueMapApi;
     this.plugin = plugin;
-    this.callback = callback;
   }
 
   private BlueMapMap findConfMaps(Collection<BlueMapMap> loadedWorlds) {
@@ -284,6 +285,8 @@ public void run() {
       return;
     }
 
+    zonedShapes.clear();
+
     //Build shapes and their bounds
     handleMarkerSet(objectiveSet);
 
@@ -303,6 +306,10 @@ public void run() {
     Log.info("Generation includes " + zonedShapes.size() + " shapes with a total of "
         + chunkCount + " chunks.");
 
-    callback.onZoneGenerationComplete( zonedShapes );
+    Component message = Component.text("Generation done!").color( NamedTextColor.GREEN );
+    Bukkit.getServer().sendMessage( message );
+
+    plugin.setGenerating( false );
+    plugin.setZonedShapes( zonedShapes );
   }
 }