manual reset on left click

src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java

@@ -503,6 +503,7 @@ public class MinecleanerArena {
 
                 currentMinecleanerGame.flag(x, y);
                 if (currentMinecleanerGame.gameover) {
+                    arenaStatus = ArenaStatus.COMPLETED;
                     plugin.getManager().handleGameover(player, this, true);
                 }
                 if (cell.isFlagged() == true) {
@@ -534,6 +535,7 @@ public class MinecleanerArena {
                 setBlockForCellType(x, y, cell);
 
                 if (currentMinecleanerGame.gameover) {
+                    arenaStatus = ArenaStatus.COMPLETED;
                     plugin.getManager().handleGameover(player, this, !(cell.isRevealed() && cell.isExploded()));
                 } else {
                     updateIngameInfoTexts();
@@ -723,10 +725,13 @@ public class MinecleanerArena {
         return currentGameStartTime;
     }
 
+    public Game getCurrentMinecleanerGame() { return currentMinecleanerGame; }
+
     public int getWidthIndex() {
         return widthIndex;
     }
 
+
     private int getRotationYaw() {
         return switch (orientation) {
             case EAST -> 90;

src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java

@@ -38,6 +38,11 @@ public class MinecleanerListener implements Listener {
             if(arena != null) {
                 e.setCancelled(true);
                 MinecleanerArena arenaClicked = plugin.getArenaList().getArenaAtBlock(block);
+                boolean hasRightClicked = false;
+                if(e.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    hasRightClicked = true;
+                }
+                if(!arenaClicked.getCurrentMinecleanerGame().gameover) {
                     if(arenaClicked == arena && arena.getArenaStatus() == ArenaStatus.PLAYING) {
                         int d0x = arena.getOrientation().getModX();
                         int d0z = arena.getOrientation().getModZ();
@@ -68,19 +73,17 @@ public class MinecleanerListener implements Listener {
                                 blockx -= blockxInt;
                                 blockz -= blockzInt;
 
-                            boolean hasRightClicked = false;
-                            if(e.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                                hasRightClicked = true;
-                            }
-
                                 if(blockzInt < arena.getArenaWidth() && blockxInt < arenaClicked.getArenaHeight()) {
                                     plugin.getManager().handleFieldClick(e.getPlayer(), blockzInt, blockxInt, hasRightClicked);
                                 }
                                 //player.sendMessage("Arena click! " + blockxInt + " " + blockzInt + " Right Clicked: " + hasRightClicked);
-
                             }
                         }
                     }
+                } else if(arenaClicked.hasPlayer() && arenaClicked.getArenaStatus() == ArenaStatus.COMPLETED && !hasRightClicked){
+                    plugin.getManager().getSchedulerGameOver().cancel();
+                    plugin.getManager().leaveArena(arenaClicked.getCurrentPlayer(), false);
+                }
             } else {
                 arena = plugin.getArenaList().getArenaAtBlock(block);
                 if(arena != null) {

src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
 import org.bukkit.Bukkit;
@@ -13,12 +12,11 @@ import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Sound;
 import org.bukkit.World;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
 import com.google.common.base.Preconditions;
 import de.iani.cubesidestats.api.PlayerStatistics;
@@ -37,6 +35,7 @@ public class MinecleanerManager {
     private final MinecleanerPlugin plugin;
     private final Inventory confirmPlayingInventory;
     private final HashMap<Integer, String> sizes;
+    public BukkitTask schedulerGameOver;
 
     // Statistics
     private final StatisticKey statisticsWonGamesTotal;
@@ -174,7 +173,7 @@ public class MinecleanerManager {
                 ps.increaseScore(sg, 1);
             }
 
-            Bukkit.getScheduler().runTaskLater(plugin, () -> {
+            schedulerGameOver = Bukkit.getScheduler().runTaskLater(plugin, () -> {
                 if (arena.getCurrentPlayer() == null) {
                     arena.removePlayer();
                 } else {
@@ -235,7 +234,7 @@ public class MinecleanerManager {
             player.sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
         }
 
-        Bukkit.getScheduler().runTaskLater(plugin, () -> {
+        schedulerGameOver = Bukkit.getScheduler().runTaskLater(plugin, () -> {
             if(arena.getCurrentPlayer() == null) {
                arena.removePlayer(); 
             } else {
@@ -464,4 +463,6 @@ public class MinecleanerManager {
     }
 
     public SettingKey getMinecleanerResetTimeSettingKey() {return minecleanerResetTimerSettingKey; }
+
+    public BukkitTask getSchedulerGameOver() { return schedulerGameOver; }
 }