From 2284912b16b5e8bc7d86dd740b9148e56cf794be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sat, 8 Oct 2022 23:36:30 +0200
Subject: [PATCH] Fixed Options not applying correctly from
 GameConfigurationInventory

---
 .../java/eu/mhsl/minenet/minigames/instance/game/Game.java  | 6 ++++--
 .../game/minigame/config/GameConfigurationInventory.java    | 2 +-
 2 files changed, 5 insertions(+), 3 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 5fde58c..7c94f17 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
@@ -2,6 +2,7 @@ package eu.mhsl.minenet.minigames.instance.game;
 
 import eu.mhsl.minenet.minigames.instance.MineNetInstance;
 import eu.mhsl.minenet.minigames.instance.game.minigame.config.GameFactory;
+import eu.mhsl.minenet.minigames.instance.game.minigame.config.Option;
 import eu.mhsl.minenet.minigames.util.CommonEventHandles;
 import eu.mhsl.minenet.minigames.instance.Spawnable;
 import eu.mhsl.minenet.minigames.instance.room.Room;
@@ -17,6 +18,7 @@ import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
@@ -44,8 +46,8 @@ public abstract class Game extends MineNetInstance implements Spawnable {
                 .addListener(ItemDropEvent.class, this::onItemDrop);
     }
 
-    public static Game initialize(GameFactory factory, Player owner) {
-        Game game = factory.manufacture(factory.configuration() != null ? factory.configuration().getAll() : null);
+    public static Game initialize(GameFactory factory, List<Option<?>> options, Player owner) {
+        Game game = factory.manufacture(options);
         Room.getRoom(owner).moveMembersToGame(game);
         game.load();
         return game;
diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/config/GameConfigurationInventory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/config/GameConfigurationInventory.java
index e5f7388..edf93b4 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/config/GameConfigurationInventory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/config/GameConfigurationInventory.java
@@ -133,7 +133,7 @@ public class GameConfigurationInventory extends InteractableInventory {
                             .lore(restrictionHandler.getWarnings(restrictionData).stream().map(translatedComponent -> translatedComponent.getAssembled(p)).collect(Collectors.toList()))
                             .build(),
                     8,
-                    itemClick -> Game.initialize(factory, itemClick.getPlayer()),
+                    itemClick -> Game.initialize(factory, map.values().stream().toList(), itemClick.getPlayer()),
                     true
             );