From 24af27f2e3290c4a2e01d5fe0cb2103a2893d3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sat, 22 Mar 2025 11:11:08 +0100
Subject: [PATCH] fixed different player gamemodes in lobby after games

---
 .../java/eu/mhsl/minenet/minigames/instance/game/Game.java | 7 +------
 .../java/eu/mhsl/minenet/minigames/instance/room/Room.java | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java
index f03c51c..9133eb8 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java
@@ -11,7 +11,6 @@ import eu.mhsl.minenet.minigames.instance.Spawnable;
 import eu.mhsl.minenet.minigames.instance.room.Room;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
-import net.minestom.server.entity.GameMode;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.item.ItemDropEvent;
 import net.minestom.server.event.player.PlayerBlockBreakEvent;
@@ -110,11 +109,7 @@ public abstract class Game extends MineNetInstance implements Spawnable {
     public void unload() {
         this.onUnload();
 
-        getPlayers().forEach(player -> {
-            Room.setOwnRoom(player);
-            player.setGameMode(GameMode.SURVIVAL);
-            player.setInvisible(false);
-        });
+        getPlayers().forEach(Room::setOwnRoom);
 
         scheduler().scheduleTask(() -> {
 
diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java b/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java
index 4a7fd0a..4bd4e81 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java
@@ -65,6 +65,7 @@ public class Room extends MineNetInstance implements Spawnable {
         p.clearTitle();
         p.getInventory().clear();
         p.setGameMode(GameMode.ADVENTURE);
+        p.setInvisible(false);
         rooms.add(room);
         players.put(p, room);
         MoveInstance.move(p, room);