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

@@ -2,10 +2,10 @@ package de.lunarakai.minecleaner;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.UUID;
 import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.ConfigurationSection;
@@ -106,49 +106,16 @@ public class ArenaList {
         return false;
     }
 
-    public void setArenaForPlayers(Player[] players, MinecleanerArena arena) {
+    public void setArenaForPlayer(Player player, MinecleanerArena arena) {
         if(arena != null) {
-            for(int i = 0; i < players.length; i++) {
+            playersInArena.put(player.getUniqueId(), arena);
-                playersInArena.put(players[i].getUniqueId(), arena);
-            }
         } else {
-            for(int i = 0; i < players.length; i++) {
+            playersInArena.remove(player.getUniqueId());
-                playersInArena.remove(players[i].getUniqueId());
-            }
         }
     }
 
     public MinecleanerArena getPlayerArena(Player player) {
-        int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroup(player).getPlayers().size() : 1;
+        return playersInArena.get(player.getUniqueId());
-        Player[] players = new Player[arraySize];
-
-        if(plugin.getGroupManager().getGroup(player) != null) {
-            for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
-                Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-                Arrays.fill(players, iteratorPlayer);
-            }
-        } else {
-            Arrays.fill(players, player);
-        }
-        return getPlayerArena(players);
-    }
-
-    public MinecleanerArena getPlayerArena(Player[] players) {
-        if(plugin.getGroupManager().getGroup(players[0]) != null) {
-            MinecleanerArena[] arenas = new MinecleanerArena[players.length];
-            for(int i = 0; i < players.length; i++) {
-                arenas[i] = playersInArena.get(players[i].getUniqueId());
-            }
-            boolean match = Arrays.stream(arenas).allMatch(s -> s.equals(arenas[0]));
-            if(match) {
-                return arenas[0];
-            } else {
-                return null;
-            }
-        } else {
-            return playersInArena.get(players[0].getUniqueId());
-        }
-
     }
 
     public MinecleanerArena getArenaAtBlock(Block block) {
@@ -160,8 +127,8 @@ public class ArenaList {
     }
 
     public void removeArena(MinecleanerArena arena) {
-        if(arena.hasPlayers()) {
+        if(arena.hasPlayer()) {
-            plugin.getManager().leaveArena(arena.getCurrentPlayers(), true, true);
+            plugin.getManager().leaveArena(arena.getCurrentPlayer(), true);
         }
         
         for(UUID id : arena.getBlockDisplays()) {

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

@@ -43,7 +43,7 @@ public class MinecleanerArena {
     private TextDisplay textDisplay;
     private boolean hasMadeFirstClick = false;
     private int flagsPlaced = 0;
-    private Player[] currentPlayers;
+    private Player currentPlayer;
     private long currentGameStartTime;
     private long ingameTime;
     private Game currentMinecleanerGame;
@@ -235,13 +235,13 @@ public class MinecleanerArena {
         new BukkitRunnable() {
             @Override
                 public void run() {
-                if(arenaStatus == ArenaStatus.PLAYING && currentPlayers != null) {
+                if(arenaStatus == ArenaStatus.PLAYING && currentPlayer != null) {
                     if(!currentMinecleanerGame.gameover) {
                         ingameTime++;
                     }
                     if(plugin.isStatisticsEnabled()) {
-                        if(plugin.getManager().getSettingsValue("additionaldisplay", currentPlayers[0]) != 0
+                        if(plugin.getManager().getSettingsValue("additionaldisplay", currentPlayer) != 0
-                                || plugin.getManager().getSettingsValue("timer", currentPlayers[0]) != 0) {
+                                || plugin.getManager().getSettingsValue("timer", currentPlayer) != 0) {
                             updateIngameInfoTexts();
                         }
                     }
@@ -254,19 +254,19 @@ public class MinecleanerArena {
 
     }
 
-    public void addJoiningPlayers(Player[] players) {
+    public void addJoiningPlayer(Player player) {
-        Preconditions.checkNotNull(players);
+        Preconditions.checkNotNull(player);
         Preconditions.checkState(arenaStatus == ArenaStatus.INACTIVE);
         this.arenaStatus = ArenaStatus.CONFIRM_PLAYING;
-        this.currentPlayers = players;
+        this.currentPlayer = player;
     }
 
-    public void removePlayers() {
+    public void removePlayer() {
         int sizeWidth = BoardSize.boardSizesWidth[widthIndex];
         int sizeHeight = BoardSize.boardSizesHeight[widthIndex];
 
         this.arenaStatus = ArenaStatus.INACTIVE;
-        this.currentPlayers = null;
+        this.currentPlayer = null;
         this.currentMinecleanerGame = null;
 
         // load chunk of block -1 and x+1
@@ -382,8 +382,8 @@ public class MinecleanerArena {
     }
 
     private void showTextDisplay() {
-        Player[] players = this.getCurrentPlayers();
+        Player player = this.getCurrentPlayer();
-        World world = players[0].getWorld();
+        World world = player.getWorld();
 
         double textCenterX = centerLocation.getX();
         double textCenterY = centerLocation.getY() + ((double) BoardSize.boardSizesHeight[widthIndex] / 3 - 2.75 - widthIndex);
@@ -417,7 +417,7 @@ public class MinecleanerArena {
             }
         }
 
-        Location textDisplayLocation = new Location(players[0].getWorld(), textCenterX, textCenterY, textCenterZ);
+        Location textDisplayLocation = new Location(player.getWorld(), textCenterX, textCenterY, textCenterZ);
 
         textDisplay = world.spawn(textDisplayLocation.add(-1, 2 + widthIndex, -0.25), TextDisplay.class, textdisplay -> {
             Transformation transformation = textdisplay.getTransformation();
@@ -445,14 +445,12 @@ public class MinecleanerArena {
     public void updateIngameInfoTexts() {
         String timer = "";
         if(plugin.isStatisticsEnabled()) {
-            if(plugin.getManager().getSettingsValue("timer", currentPlayers[0]) != 0) {
+            if(plugin.getManager().getSettingsValue("timer", currentPlayer) != 0) {
                 timer = ChatColor.GOLD + " Zeit: " + MinecleanerStringUtil.timeToString((ingameTime/20)*1000, true)  + " ";
             }
-            if(plugin.getManager().getSettingsValue("additionaldisplay", currentPlayers[0]) != 0 && plugin.isStatisticsEnabled()) {
+            if(plugin.getManager().getSettingsValue("additionaldisplay", currentPlayer) != 0 && plugin.isStatisticsEnabled()) {
                 String componentActionBar = ChatColor.GREEN + "Flaggen gesetzt: " + flagsPlaced + ChatColor.RED + "  Minen insgesamt: " + BoardSize.mineCounter[widthIndex];
-                for(int i = 0; i < currentPlayers.length; i++) {
+                currentPlayer.sendActionBar(Component.text(componentActionBar + " " + timer));
-                    currentPlayers[i].sendActionBar(Component.text(componentActionBar + " " + timer));
-                }
             }
         }
 
@@ -497,7 +495,7 @@ public class MinecleanerArena {
         if (currentMinecleanerGame != null && !currentMinecleanerGame.gameover) {
             Cell cell = currentMinecleanerGame.getCell(x, y);
             if (!cell.isRevealed()) {
-                Player[] players = this.currentPlayers;
+                Player player = this.currentPlayer;
 
                 currentMinecleanerGame.flag(x, y);
                 if (currentMinecleanerGame.gameover) {
@@ -505,7 +503,7 @@ public class MinecleanerArena {
                          arenaStatus = ArenaStatus.COMPLETED;
                     }, 5L);
 
-                    plugin.getManager().handleGameover(players, this, true);
+                    plugin.getManager().handleGameover(player, this, true);
                 }
                 if (cell.isFlagged() == true) {
                     flagsPlaced = flagsPlaced + 1;
@@ -525,7 +523,7 @@ public class MinecleanerArena {
         if (currentMinecleanerGame != null && !currentMinecleanerGame.gameover) {
             Cell cell = currentMinecleanerGame.getCell(x, y);
             if (!cell.isFlagged()) {
-                Player[] players = this.currentPlayers;
+                Player player = this.currentPlayer;
 
                 if (!hasMadeFirstClick) {
                     currentMinecleanerGame.firstClick(x, y);
@@ -539,7 +537,7 @@ public class MinecleanerArena {
                     Bukkit.getScheduler().runTaskLater(plugin, () -> {
                         arenaStatus = ArenaStatus.COMPLETED;
                     }, 5L);
-                    plugin.getManager().handleGameover(players, this, !(cell.isRevealed() && cell.isExploded()));
+                    plugin.getManager().handleGameover(player, this, !(cell.isRevealed() && cell.isExploded()));
                 } else {
                     updateIngameInfoTexts();
                 }
@@ -694,12 +692,12 @@ public class MinecleanerArena {
         return name;
     }
 
-    public boolean hasPlayers() {
+    public boolean hasPlayer() {
-        return currentPlayers != null;
+        return currentPlayer != null;
     }
 
-    public Player[] getCurrentPlayers() {
+    public Player getCurrentPlayer() {
-        return currentPlayers;
+        return currentPlayer;
     }
 
     public Location getLocation() {

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

@@ -1,137 +0,0 @@
-package de.lunarakai.minecleaner;
-
-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.*;
-
-public class MinecleanerGroupManager {
-
-    public class MinecleanerGroup {
-
-        public UUID owner;
-        public HashSet<UUID> players;
-        public Set<UUID> invitedPlayers;
-
-        public MinecleanerGroup(UUID owner){
-            this.owner = owner;
-            this.players = new HashSet<>();
-            this.invitedPlayers = new HashSet<>();
-        }
-
-        public UUID getOwner() {
-            return owner;
-        }
-
-        public Set<UUID> getInvitedPlayers() {
-            return invitedPlayers;
-        }
-
-        public HashSet<UUID> getPlayers() {
-            return players;
-        }
-
-        public void addPlayerToGroup(Player player) {
-            UUID playerUUID = player.getUniqueId();
-
-            if(!isPlayerInvited(playerUUID)) {
-                return;
-            }
-
-            invitedPlayers.remove(playerUUID);
-            players.add(playerUUID);
-        }
-
-        public void removePlayerFromGroup(Player player) {
-            UUID playerUUID = player.getUniqueId();
-            if(getOwner() == playerUUID) {
-                for(Iterator<UUID> iterator = getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
-                    if(getOwner() == iterator.next()) {
-                        continue;
-                    }
-                    Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-                    iteratorPlayer.sendMessage(Component.text("Die Gruppe wurde aufgelöst, da die Person, welche die Gruppe erstellt hat, aus der Gruppe entfernt wurde.", NamedTextColor.YELLOW));
-
-                }
-                deleteGroup(getGroup(Bukkit.getPlayer(owner)));
-            }
-            players.remove(playerUUID);
-            if(players.size() < 2) {
-                Bukkit.getPlayer(owner).sendMessage(Component.text("Die Gruppe wurde aufgelöst, da du nur noch alleine in der Gruppe bist", NamedTextColor.YELLOW));
-                deleteGroup(getGroup(Bukkit.getPlayer(owner)));
-            }
-        }
-
-        public boolean isPlayerInvited(UUID playerUUID) {
-            return invitedPlayers.contains(playerUUID);
-        }
-
-        public boolean isInGroup(UUID playerUUID) {
-            return players.contains(playerUUID) || owner.equals(playerUUID);
-        }
-
-        public boolean invitePlayerToGroup(Player player) {
-            UUID playerUUID = player.getUniqueId();
-            if(isPlayerInvited(playerUUID) || isInGroup(playerUUID))
-                return false;
-
-            invitedPlayers.add(player.getUniqueId());
-            return true;
-        }
-
-        public void removePlayerFromInvitedList(Player player) {
-            UUID playerUUID = player.getUniqueId();
-            if(!isPlayerInvited(playerUUID)) {
-                return;
-            }
-            invitedPlayers.remove(playerUUID);
-        }
-    }
-
-    private final UUID groupCreator;
-    private final Set<MinecleanerGroup> groups;
-
-    public MinecleanerGroupManager() {
-        this.groupCreator = null;
-        this.groups = new HashSet<>();
-    }
-
-    public void createGroup(Player player) {
-
-        if (getGroup(player) != null) {
-            return;
-        }
-
-        groups.add(new MinecleanerGroup(player.getUniqueId()));
-    }
-
-    public MinecleanerGroup getGroup(Player player){
-        UUID playerUUID = player.getUniqueId();
-        for (MinecleanerGroup group : groups) {
-            if (group.isInGroup(playerUUID)) {
-                return group;
-            }
-        }
-        return null;
-    }
-
-    public MinecleanerGroup getInvitedGroup(Player player){
-        UUID playerUUID = player.getUniqueId();
-        for (MinecleanerGroup group : groups) {
-            if (group.isPlayerInvited(playerUUID)) {
-                return group;
-            }
-        }
-        return null;
-    }
-
-    private void deleteGroup(MinecleanerGroup minecleanerGroup) {
-        groups.remove(minecleanerGroup);
-    }
-
-    public void deleteAllGroups() {
-        groups.clear();
-    }
-}

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

@@ -1,11 +1,6 @@
 package de.lunarakai.minecleaner;
 
-import java.sql.Array;
-import java.util.Arrays;
 import java.util.Iterator;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -91,9 +86,9 @@ public class MinecleanerListener implements Listener {
                             }
                         }
                     }
-                } else if(arena.hasPlayers() && arena.getArenaStatus() == ArenaStatus.COMPLETED && !hasRightClicked && (plugin.getManager().getSettingsValue("allowmanualreset", e.getPlayer()) == 1)) {
+                } else if(arena.hasPlayer() && arena.getArenaStatus() == ArenaStatus.COMPLETED && !hasRightClicked && (plugin.getManager().getSettingsValue("allowmanualreset", e.getPlayer()) == 1)) {
                     plugin.getManager().getSchedulerGameOver().cancel();
-                    plugin.getManager().leaveArena(arenaClicked.getCurrentPlayers(), false, true);
+                    plugin.getManager().leaveArena(arenaClicked.getCurrentPlayer(), false);
                 }
             } else {
                 arena = plugin.getArenaList().getArenaAtBlock(block);
@@ -101,18 +96,7 @@ public class MinecleanerListener implements Listener {
                     e.setCancelled(true);
                     if(e.getHand() == EquipmentSlot.HAND) {
                         if(arena.getArenaStatus() == ArenaStatus.INACTIVE) {
-                            int arraySize = plugin.getGroupManager().getGroup(e.getPlayer()) != null ? plugin.getGroupManager().getGroup(e.getPlayer()).getPlayers().size() : 1;
+                            plugin.getManager().joinArena(e.getPlayer(), arena);
-                            Player[] players = new Player[arraySize];
-
-                            if(plugin.getGroupManager().getGroup(e.getPlayer()) != null) {
-                                for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(e.getPlayer()).getPlayers().iterator(); iterator.hasNext();) {
-                                    Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-                                    Arrays.fill(players, iteratorPlayer);
-                                }
-                            } else {
-                                Arrays.fill(players, e.getPlayer());
-                            }
-                            plugin.getManager().joinArena(players, arena);
                         } else {
                             e.getPlayer().sendMessage(ChatColor.YELLOW + "Hier spielt schon jemand anderes");
                         }
@@ -140,16 +124,7 @@ public class MinecleanerListener implements Listener {
                         int slot = e.getRawSlot();
                         boolean hasConfirmed = slot == 1 ? true : false;
                         if(hasConfirmed) {  
-                            Player[] players;
+                            plugin.getManager().startGame(player);
-                            if(plugin.getGroupManager().getGroup(player) != null) {
-                                players = new Player[plugin.getGroupManager().getGroup(player).getPlayers().size()];
-                                players[0] = player;
-                            } else {
-                                players = new Player[1];
-                                players[0] = player;
-                            }
-                            plugin.getManager().startGame(players);
-
                             //player.closeInventory();
                         }
                         player.closeInventory();
@@ -165,18 +140,7 @@ public class MinecleanerListener implements Listener {
             MinecleanerArena arena = plugin.getArenaList().getPlayerArena(player);
             if(arena != null) {
                 if(arena.getArenaStatus() == ArenaStatus.CONFIRM_PLAYING && e.getInventory().equals(plugin.getManager().getConfirmPlayingInventory())) {
-                    int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroup(player).getPlayers().size() : 1;
+                    plugin.getManager().leaveArena(player, false);
-                    Player[] players = new Player[arraySize];
-
-                    if(plugin.getGroupManager().getGroup(player) != null) {
-                        for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
-                            Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-                            Arrays.fill(players, iteratorPlayer);
-                        }
-                    } else {
-                        Arrays.fill(players, player);
-                    }
-                    plugin.getManager().leaveArena(players, false, true);
                 }
             }
         }
@@ -187,12 +151,9 @@ public class MinecleanerListener implements Listener {
         final Player player = e.getPlayer();
         MinecleanerArena arena = plugin.getArenaList().getPlayerArena(player);
         if(arena != null) {
-            if(arena.isTooFarAway(player) && plugin.getGroupManager().getGroup(player) == null) {
+            if(arena.isTooFarAway(player)) {
                 player.sendMessage(ChatColor.YELLOW + "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.");
-                Player[] players = new Player[] {
+                plugin.getManager().leaveArena(player, false);
-                        player
-                };
-                plugin.getManager().leaveArena(players, false, true);
             }
         }
     }
@@ -201,27 +162,7 @@ public class MinecleanerListener implements Listener {
     public void onPlayerQuit(PlayerQuitEvent e) {
         MinecleanerArena arena = plugin.getArenaList().getPlayerArena(e.getPlayer());
         if(arena != null) {
-            if(plugin.getGroupManager().getGroup(e.getPlayer()) != null) {
+            plugin.getManager().leaveArena(e.getPlayer(), false);
-                if(plugin.getGroupManager().getGroup(e.getPlayer()).getOwner().equals(e.getPlayer())) {
-                    Player[] players = new Player[plugin.getGroupManager().getGroup(e.getPlayer()).getPlayers().size()];
-                    for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(e.getPlayer()).getPlayers().iterator(); iterator.hasNext();) {
-                        Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-                        Arrays.fill(players, iteratorPlayer);
-                    }
-                    plugin.getManager().leaveArena(players, false, true);
-                    return;
-                }
-                Player[] players = new Player[] {
-                        e.getPlayer()
-                };
-                plugin.getGroupManager().getGroup(e.getPlayer()).removePlayerFromGroup(e.getPlayer());
-                plugin.getManager().leaveArena(players, false, false);
-            } else {
-                Player[] players = new Player[] {
-                        e.getPlayer()
-                };
-                plugin.getManager().leaveArena(players, false, true);
-            }
         }
     }
 

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

@@ -1,9 +1,11 @@
 package de.lunarakai.minecleaner;
 
 import de.iani.cubesidestats.api.SettingKey;
-
+import java.util.ArrayList;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.UUID;
 import java.util.function.Consumer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -129,94 +131,61 @@ public class MinecleanerManager {
     }
 
 
-    public void joinArena(Player[] players, MinecleanerArena arena) {
+    public void joinArena(Player player, MinecleanerArena arena) {
-        if (!players[0].hasPermission(MinecleanerPlugin.PERMISSION_PLAY)) {
+        if (!player.hasPermission(MinecleanerPlugin.PERMISSION_PLAY)) {
             return;
         }
-        Preconditions.checkArgument(plugin.getArenaList().getPlayerArena(players) == null, "player is in an arena");
+        Preconditions.checkArgument(plugin.getArenaList().getPlayerArena(player) == null, "player is in an arena");
         Preconditions.checkArgument(arena.getArenaStatus() == ArenaStatus.INACTIVE, "arena is in use");
-        arena.addJoiningPlayers(players);
+        arena.addJoiningPlayer(player);
-        plugin.getArenaList().setArenaForPlayers(players, arena);
+        plugin.getArenaList().setArenaForPlayer(player, arena);
-        for(int i = 0; i < players.length; i++) {
+        player.openInventory(confirmPlayingInventory);
-            if(plugin.getGroupManager().getGroup(players[i]) == null) {
-                players[i].openInventory(confirmPlayingInventory);
-                break;
-            }
-            if(players[i] == Bukkit.getPlayer(plugin.getGroupManager().getGroup(players[i]).getOwner())) {
-                players[i].openInventory(confirmPlayingInventory);
-            }
-        }
     }
 
-    public void leaveArena(Player[] players, boolean message, boolean reset) {
+    public void leaveArena(Player player, boolean message) {
-        MinecleanerGroupManager.MinecleanerGroup group = null;
+        MinecleanerArena arena = plugin.getArenaList().getPlayerArena(player);
-        MinecleanerArena arena;
+        arena.setArenaStaus(ArenaStatus.INACTIVE);
-        if(plugin.getGroupManager().getGroup(players[0]) != null) {
-            group = plugin.getGroupManager().getGroup(players[0]);
-            arena = plugin.getArenaList().getPlayerArena(Objects.requireNonNull(Bukkit.getPlayer(group.getOwner())));
-        } else {
-            arena = plugin.getArenaList().getPlayerArena(players);
-        }
-
         Preconditions.checkArgument(arena != null, "player is in no arena");
-
+        player.closeInventory();
-        if(reset) {
+        arena.removePlayer();
-            arena.setArenaStaus(ArenaStatus.INACTIVE);
+        plugin.getArenaList().setArenaForPlayer(player, null);
-            for(int i = 0; i < players.length; i++) {
+        if(message) {
-                players[i].closeInventory();
+            player.sendMessage(ChatColor.YELLOW + "Das " + plugin.getDisplayedPluginName() + "spiel wurde abgebrochen.");
-            }
-            arena.removePlayers();
-            if(message) {
-                for(int i = 0; i < players.length; i++) {
-                    players[i].sendMessage(ChatColor.YELLOW + "Das " + plugin.getDisplayedPluginName() + "spiel wurde abgebrochen.");
-                }
-            }
         }
-
-        plugin.getArenaList().setArenaForPlayers(players, null);
     }
 
-
+    public void startGame(Player player) {
-    public void startGame(Player[] players) {
+        MinecleanerArena arena = plugin.getArenaList().getPlayerArena(player);
-        MinecleanerArena arena = plugin.getArenaList().getPlayerArena(players);
         Preconditions.checkArgument(arena != null, "player is in no arena");
         Preconditions.checkState(arena.getArenaStatus() == ArenaStatus.CONFIRM_PLAYING, "not confirming playing status");
         arena.startNewGame();
-        for(int i = 0; i < players.length; i++) {
+        player.sendMessage(ChatColor.YELLOW + "Du hast eine neue Runde " + plugin.getDisplayedPluginName() + " gestartet.");
-            players[i].sendMessage(ChatColor.YELLOW + "Du hast eine neue Runde " + plugin.getDisplayedPluginName() + " gestartet.");
-        }
-
     }
 
-    public void handleGameover(Player[] player, MinecleanerArena arena, boolean isSuccessfullyCleared) {
+    public void handleGameover(Player player, MinecleanerArena arena, boolean isSuccessfullyCleared) {
-        if(plugin.getGroupManager().getGroup(player[0]) != null) {
+        World world = player.getWorld();
-            // Todo
-            //  eigene Extra Punkte
-            return;
-        }
-        World world = player[0].getWorld();
         PlayerStatistics ps = null;
         StatisticKey sg = null;
         if(plugin.isStatisticsEnabled()) {
-            ps = plugin.getCubesideStatistics().getStatistics(player[0].getUniqueId());
+            ps = plugin.getCubesideStatistics().getStatistics(player.getUniqueId());
             sg = statisticsTotalGamesPlayed.get(arena.getWidthIndex());
         }
 
         if(!isSuccessfullyCleared) {
-            world.playSound(player[0].getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.5f, 0.5f);
+            world.playSound(player.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.5f, 0.5f);
-            player[0].sendMessage(ChatColor.YELLOW + "Game Over! Du konntest das " + plugin.getDisplayedPluginName() + "-Feld nicht erfolgreich lösen!");
+            player.sendMessage(ChatColor.YELLOW + "Game Over! Du konntest das " + plugin.getDisplayedPluginName() + "-Feld nicht erfolgreich lösen!");
             arena.showMines();
             
             if(sg != null && plugin.isStatisticsEnabled()) {
                 ps.increaseScore(sg, 1);
             }
 
-            scheduleArenaReset(player[0], arena);
+            scheduleArenaReset(player, arena);
             return;
         }
         int millis = (int) (System.currentTimeMillis() - arena.getCurrentGameStartTime());
         
-        world.playSound(player[0].getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.5f, 0.5f);
+        world.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.5f, 0.5f);
 
         if(sg != null && plugin.isStatisticsEnabled()) {
             ps.increaseScore(sg, 1);
@@ -233,9 +202,9 @@ public class MinecleanerManager {
             if(sg != null) {
                 ps.minScore(sg, millis, isUpdated -> {
                     if(isUpdated != null && isUpdated) {
-                        player[0].sendMessage(ChatColor.GOLD + "Herzlichen Glückwunsch! Du hast eine neue Bestzeit erreicht! " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) );
+                        player.sendMessage(ChatColor.GOLD + "Herzlichen Glückwunsch! Du hast eine neue Bestzeit erreicht! " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) );
                     } else {
-                        player[0].sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
+                        player.sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
                     }
                 });
             }
@@ -263,29 +232,19 @@ public class MinecleanerManager {
                 }
             }
         } else {
-            player[0].sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
+            player.sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
         }
 
-        scheduleArenaReset(player[0], arena);
+        scheduleArenaReset(player, arena);
     }
 
     private void scheduleArenaReset(Player player, MinecleanerArena arena) {
         schedulerGameOver = Bukkit.getScheduler().runTaskLater(plugin, () -> {
             if(arena.getArenaStatus() == ArenaStatus.COMPLETED) {
-                if (arena.getCurrentPlayers() == null) {
+                if (arena.getCurrentPlayer() == null) {
-                    arena.removePlayers();
+                    arena.removePlayer();
                 } else {
-                    int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroup(player).getPlayers().size() : 1;
+                    leaveArena(player, false);
-                    Player[] players = new Player[arraySize];
-                    if(plugin.getGroupManager().getGroup(player) != null) {
-                        for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
-                            Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-                            Arrays.fill(players, iteratorPlayer);
-                        }
-                    } else {
-                        Arrays.fill(players, player);
-                    }
-                    leaveArena(players, false, true);
                 }
             }
         }, plugin.getManager().getSettingsValue("resettime", player) * 20L);
@@ -293,12 +252,13 @@ public class MinecleanerManager {
 
     public void clearAllArenas() {
         for(MinecleanerArena arena : plugin.getArenaList().getArenas()) {
-            if(arena.hasPlayers()) {
+            if(arena.hasPlayer()) {
-                leaveArena(arena.getCurrentPlayers(), true, true);
+                leaveArena(arena.getCurrentPlayer(), true);
             }
         }
     }
 
+
     public void handleFieldClick(@NotNull Player player, int x, int y, boolean hasRightClicked) {
         MinecleanerArena arena = plugin.getArenaList().getPlayerArena(player);
         Preconditions.checkArgument(arena != null, "player is in no arena");

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

@@ -25,7 +25,6 @@ public final class MinecleanerPlugin extends JavaPlugin {
     public static final String PERMISSION_ADMIN = "minecleaner.admin";
 
     private MinecleanerManager minecleanerManager;
-    private MinecleanerGroupManager minecleanerGroupManager;
     private ArenaList arenaList;
     private CubesideStatisticsAPI cubesideStatistics;
     private PlayerUUIDCache playerUUIDCache;
@@ -65,7 +64,6 @@ public final class MinecleanerPlugin extends JavaPlugin {
         arenaList.load();
 
         minecleanerManager = new MinecleanerManager(this);
-        minecleanerGroupManager = new MinecleanerGroupManager();
         getServer().getPluginManager().registerEvents(new MinecleanerListener(this), this);
 
         CommandRouter minecleanerCommand = new CommandRouter(getCommand("minecleaner"));
@@ -86,9 +84,6 @@ public final class MinecleanerPlugin extends JavaPlugin {
         if(minecleanerManager != null) {
             minecleanerManager.clearAllArenas();
         }
-        if(minecleanerGroupManager != null) {
-            minecleanerGroupManager.deleteAllGroups();
-        }
     }
 
     public ArenaList getArenaList() {
@@ -99,8 +94,6 @@ public final class MinecleanerPlugin extends JavaPlugin {
         return minecleanerManager;
     }
 
-    public MinecleanerGroupManager getGroupManager() { return minecleanerGroupManager; }
-
     public boolean isStatisticsEnabled() {
         return cubesideStatistics != null;
     }

src/main/java/de/lunarakai/minecleaner/commands/InviteCommand.java

@@ -0,0 +1,37 @@
+package de.lunarakai.minecleaner.commands;
+
+import de.iani.cubesideutils.bukkit.commands.SubCommand;
+import de.iani.cubesideutils.bukkit.commands.exceptions.*;
+import de.iani.cubesideutils.commands.ArgsParser;
+import de.lunarakai.minecleaner.MinecleanerPlugin;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+public class InviteCommand extends SubCommand {
+    /*
+        TODO:
+            - Invite other Players to play in Duo Mode
+            - Add Functionality to support multiple Players in the same game
+            - use settings of player that invited the other player
+     */
+
+    @Override
+    public String getUsage() {
+        return "<Player>";
+    }
+
+    @Override
+    public boolean requiresPlayer() {
+        return true;
+    }
+
+    @Override
+    public String getRequiredPermission() {
+        return MinecleanerPlugin.PERMISSION_PLAY;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String s1, ArgsParser argsParser) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
+        return false;
+    }
+}

src/main/java/de/lunarakai/minecleaner/commands/groups/AcceptCommand.java

@@ -1,54 +0,0 @@
-package de.lunarakai.minecleaner.commands.groups;
-
-import de.iani.cubesideutils.bukkit.commands.SubCommand;
-import de.iani.cubesideutils.bukkit.commands.exceptions.*;
-import de.iani.cubesideutils.commands.ArgsParser;
-import de.lunarakai.minecleaner.MinecleanerPlugin;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class AcceptCommand extends SubCommand {
-    private final MinecleanerPlugin plugin;
-
-    public AcceptCommand(MinecleanerPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public String getUsage() {
-        return "";
-    }
-
-    @Override
-    public boolean requiresPlayer() {
-        return true;
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return MinecleanerPlugin.PERMISSION_PLAY;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String s1, ArgsParser argsParser) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
-        Player player = (Player) commandSender;
-
-        if(plugin.getGroupManager().getInvitedGroup(player) != null && plugin.getGroupManager().getGroup(player) == null) {
-            Player groupOwner = Bukkit.getPlayer(plugin.getGroupManager().getInvitedGroup(player).getOwner());
-            plugin.getGroupManager().getInvitedGroup(player).addPlayerToGroup(player);
-
-            assert groupOwner != null;
-            groupOwner.sendMessage(Component.text(player.getName() + " hat deine Einladung angenommen.", NamedTextColor.GREEN));
-            player.sendMessage(Component.text("Du hast die Einladung angenommen", NamedTextColor.GREEN));
-
-            return true;
-        } else {
-            player.sendMessage(Component.text("Du wurdest in keine Gruppe eingeladen.", NamedTextColor.YELLOW));
-        }
-        return true;
-    }
-}

src/main/java/de/lunarakai/minecleaner/commands/groups/DenyCommand.java

@@ -1,56 +0,0 @@
-package de.lunarakai.minecleaner.commands.groups;
-
-import de.iani.cubesideutils.bukkit.commands.SubCommand;
-import de.iani.cubesideutils.bukkit.commands.exceptions.*;
-import de.iani.cubesideutils.commands.ArgsParser;
-import de.lunarakai.minecleaner.MinecleanerPlugin;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class DenyCommand extends SubCommand {
-
-    private final MinecleanerPlugin plugin;
-
-    public DenyCommand(MinecleanerPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public String getUsage() {
-        return "";
-    }
-
-    @Override
-    public boolean requiresPlayer() {
-        return true;
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return MinecleanerPlugin.PERMISSION_PLAY;
-    }
-
-
-    @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String s1, ArgsParser argsParser) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
-        Player player = (Player) commandSender;
-
-        if(plugin.getGroupManager().getInvitedGroup(player) != null && plugin.getGroupManager().getGroup(player) == null) {
-            Player groupOwner = Bukkit.getPlayer(plugin.getGroupManager().getInvitedGroup(player).getOwner());
-            plugin.getGroupManager().getInvitedGroup(player).removePlayerFromInvitedList(player);
-
-            assert groupOwner != null;
-            groupOwner.sendMessage(Component.text(player.getName() + " hat deine Einladung abgelehnt.", NamedTextColor.RED));
-            player.sendMessage(Component.text("Du hast die Einladung abgelehnt", NamedTextColor.YELLOW));
-
-            return true;
-        } else {
-            player.sendMessage(Component.text("Du wurdest in keine Gruppe eingeladen.", NamedTextColor.YELLOW));
-        }
-        return true;
-    }
-}

src/main/java/de/lunarakai/minecleaner/commands/groups/InviteCommand.java

@@ -1,74 +0,0 @@
-package de.lunarakai.minecleaner.commands.groups;
-
-import de.iani.cubesideutils.bukkit.commands.SubCommand;
-import de.iani.cubesideutils.bukkit.commands.exceptions.*;
-import de.iani.cubesideutils.commands.ArgsParser;
-import de.lunarakai.minecleaner.MinecleanerGroupManager;
-import de.lunarakai.minecleaner.MinecleanerPlugin;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class InviteCommand extends SubCommand {
-    /*
-        TODO:
-            - Invite other Players to play in Duo Mode
-            - Add Functionality to support multiple Players in the same game
-            - use settings of player that invited the other player
-     */
-
-    private final MinecleanerPlugin plugin;
-
-    public InviteCommand(MinecleanerPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public String getUsage() {
-        return "<Player>";
-    }
-
-    @Override
-    public boolean requiresPlayer() {
-        return true;
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return MinecleanerPlugin.PERMISSION_PLAY;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String s, String commandString, ArgsParser args) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
-        Player player = (Player) sender;
-        if(args.remaining() < 1 || args.remaining() >= 2) {
-            sender.sendMessage(Component.text(commandString + getUsage(), NamedTextColor.DARK_RED));
-            return true;
-        }
-        String playerName = args.getNext().trim();
-        Player invitedPlayer = plugin.getServer().getPlayer(playerName);
-
-        MinecleanerGroupManager groupManager = plugin.getGroupManager();
-        if(groupManager.getInvitedGroup(player) != null) {
-            player.sendMessage(Component.text("Du wurdest bereits in eine Gruppe eingeladen. Bitte kümmere dich zuerst um die Einladung bevor du eine eigene Gruppe erstellst.", NamedTextColor.YELLOW));
-            return true;
-        }
-
-        if(groupManager.getGroup(player) != null && Bukkit.getPlayer(groupManager.getGroup(player).getOwner()).equals(player)) {
-            player.sendMessage(Component.text("Nur als Ersteller der Gruppe bist du berechtigt Leute einzuladen.", NamedTextColor.YELLOW));
-            return true;
-        }
-
-        if(groupManager.getGroup(player) == null) {
-            groupManager.createGroup(player);
-        }
-
-        assert invitedPlayer != null;
-        groupManager.getGroup(player).invitePlayerToGroup(invitedPlayer);
-
-        return true;
-    }
-}