pre generate 1 arena duplicate once arena setup is done

Author: Devlrxxh

Plugin/src/main/java/dev/lrxh/neptune/feature/customkit/menu/CustomKitEffectsMenu.java

@@ -22,8 +22,6 @@
 import java.util.List;
 
 public class CustomKitEffectsMenu extends PaginatedMenu {
-    private static final int DURATION = 1_000_000;
-    private static final int MAX_AMPLIFIER = 4;
     private final CustomKit kit;
 
     public CustomKitEffectsMenu(CustomKit kit) {
@@ -59,12 +57,12 @@ public ItemStack getItemStack(Player p) {
                 public void onClick(ClickType type2, Player p) {
                     PotionEffect current = find(type);
                     if (type2.isRightClick()) {
-                        int amp = current == null ? 0 : (current.getAmplifier() + 1) % (MAX_AMPLIFIER + 1);
+                        int amp = current == null ? 0 : (current.getAmplifier() + 1) % (4 + 1);
                         kit.getPotionEffects().remove(current);
-                        kit.getPotionEffects().add(new PotionEffect(type, DURATION, amp));
+                        kit.getPotionEffects().add(new PotionEffect(type, 1_000_000, amp));
                     } else {
                         if (current != null) kit.getPotionEffects().remove(current);
-                        else kit.getPotionEffects().add(new PotionEffect(type, DURATION, 0));
+                        else kit.getPotionEffects().add(new PotionEffect(type, 1_000_000, 0));
                     }
                     Profile profile = API.getProfile(p);
                     if (profile != null) Profile.save(profile);

Plugin/src/main/java/dev/lrxh/neptune/feature/queue/tasks/QueueCheckTask.java

@@ -68,7 +68,12 @@ public void run() {
             int ping1 = PlayerUtil.getPing(uuid1);
             int ping2 = PlayerUtil.getPing(uuid2);
 
-            if (!(ping2 <= settings1.getMaxPing() && ping1 <= settings2.getMaxPing())) {
+            boolean pingInRange = ping2 <= settings1.getMaxPing() && ping1 <= settings2.getMaxPing();
+            // bypass ping range once a player has waited 10s
+            boolean waitedTooLong = queueEntry1.getTime().getElapsed() >= 10_000
+                    || queueEntry2.getTime().getElapsed() >= 10_000;
+
+            if (!pingInRange && !waitedTooLong) {
                 QueueService.get().add(queueEntry1, false);
                 QueueService.get().add(queueEntry2, false);
                 continue;

Plugin/src/main/java/dev/lrxh/neptune/game/arena/ArenaService.java

@@ -24,7 +24,6 @@ public class ArenaService extends IService implements IArenaService {
     public final LinkedHashSet<Arena> arenas = new LinkedHashSet<>();
     public final LinkedHashSet<Arena> duplicates = new LinkedHashSet<>();
     private final Set<Integer> reservedIndices = new HashSet<>();
-    private static final int GRID_COLUMNS = 32;
 
     public static ArenaService get() {
         if (instance == null) instance = new ArenaService();
@@ -84,11 +83,11 @@ public int gridDistance() {
     }
 
     public int gridCellX(int index) {
-        return (index % GRID_COLUMNS) * gridDistance();
+        return (index % 32) * gridDistance();
     }
 
     public int gridCellZ(int index) {
-        return (index / GRID_COLUMNS) * gridDistance();
+        return (index / 32) * gridDistance();
     }
 
     public int nextFreeGridIndex() {
@@ -97,7 +96,7 @@ public int nextFreeGridIndex() {
             if (dup.getMin() != null) {
                 int col = Math.floorDiv(dup.getMin().getBlockX(), gridDistance());
                 int row = Math.floorDiv(dup.getMin().getBlockZ(), gridDistance());
-                used.add(row * GRID_COLUMNS + col);
+                used.add(row * 32 + col);
             }
         }
         int i = 0;

Plugin/src/main/java/dev/lrxh/neptune/game/arena/listener/ArenaEditorChatListener.java

@@ -116,7 +116,8 @@ public void run() {
                 event.setCancelled(true);
                 profile.getArenaProcedure().setType(ArenaProcedureType.NONE);
                 Arena arena = profile.getArenaProcedure().getArena();
-                if (!arena.isSetup() || !arena.isDoneLoading()) {
+                boolean firstSetup = !arena.isSetup() || !arena.isDoneLoading();
+                if (firstSetup) {
                     player.sendMessage(CC.success("Arena setup complete"));
                 } else {
                     player.sendMessage(CC.success("Set arena max position"));
@@ -126,6 +127,9 @@ public void run() {
                     @Override
                     public void run() {
                         arena.setMax(player.getLocation());
+                        if (firstSetup && Neptune.get().isDuplicatesEnabled()) {
+                            ArenaService.get().createDuplicate(arena);
+                        }
                         new ArenaManagementMenu(profile.getArenaProcedure().getArena()).open(player);
                         profile.getArenaProcedure().setArena(null);
                     }

Plugin/src/main/java/dev/lrxh/neptune/utils/Time.java

@@ -38,6 +38,10 @@ public String formatSecondsMillis() {
         return (seconds < 10 ? "0" : "") + seconds + "." + (millis < 10 ? "0" : "") + millis + "s";
     }
 
+    public long getElapsed() {
+        return System.currentTimeMillis() - oldTime;
+    }
+
     public void setZero() {
         this.oldTime = 0;
         this.lastCurrentTime = 0;