diff --git a/src/main/java/com/alterdekim/game/component/game/GameRoom.java b/src/main/java/com/alterdekim/game/component/game/GameRoom.java index bff58c6..c7be517 100644 --- a/src/main/java/com/alterdekim/game/component/game/GameRoom.java +++ b/src/main/java/com/alterdekim/game/component/game/GameRoom.java @@ -64,11 +64,10 @@ public class GameRoom extends Thread { this.socks = new ConcurrentHashMap<>(); this.state = GameState.MOVE; this.manager = new ConcurrentHashMap<>(); - log.info("GameRoomManagerState: yup"); Arrays.stream(GameState.values()).forEach(s -> { try { - log.info("GameRoomMgr: {}; {}; {}; {}", s, s.getAllowedRequests(), s.getManagerClass(), s.isAllowedDialog()); - this.manager.put(s, s.getManagerClass().getDeclaredConstructor().newInstance(this)); + this.manager.put(s, s.getManagerClass().getDeclaredConstructor().newInstance()); + this.manager.get(s).setParent(this); } catch (Exception e) { log.error(e.getMessage()); } diff --git a/src/main/java/com/alterdekim/game/component/game/statemanager/MoveManager.java b/src/main/java/com/alterdekim/game/component/game/statemanager/MoveManager.java index 8a78ef5..d6c6e64 100644 --- a/src/main/java/com/alterdekim/game/component/game/statemanager/MoveManager.java +++ b/src/main/java/com/alterdekim/game/component/game/statemanager/MoveManager.java @@ -3,16 +3,14 @@ package com.alterdekim.game.component.game.statemanager; import com.alterdekim.game.component.game.*; import com.alterdekim.game.websocket.message.BasicMessage; import com.alterdekim.game.websocket.message.WebSocketMessageType; +import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.Collections; import java.util.List; +@NoArgsConstructor public class MoveManager extends StateManager { - public MoveManager(GameRoom parent) { - super(parent); - } - @Override public void performState() { List buttons = new ArrayList<>(); diff --git a/src/main/java/com/alterdekim/game/component/game/statemanager/StateManager.java b/src/main/java/com/alterdekim/game/component/game/statemanager/StateManager.java index 7339bf9..8c9b481 100644 --- a/src/main/java/com/alterdekim/game/component/game/statemanager/StateManager.java +++ b/src/main/java/com/alterdekim/game/component/game/statemanager/StateManager.java @@ -3,13 +3,15 @@ package com.alterdekim.game.component.game.statemanager; import com.alterdekim.game.component.game.GameRoom; import com.alterdekim.game.websocket.message.BasicMessage; import lombok.Getter; -import lombok.RequiredArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Setter; @Getter -@RequiredArgsConstructor +@Setter +@NoArgsConstructor public abstract class StateManager { - private final GameRoom parent; + private GameRoom parent; public abstract void performState(); public abstract void performDialogAction(BasicMessage message);