diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index 06c27c5..c127387 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -13,9 +13,9 @@ private List opens = new ArrayList<>(); private DrawingController drawingController = null; private Settings settings = null; - private static List turnList = new ArrayList<>(); + private List turnList = new ArrayList<>(); private Turn nowTurn = null; - + private Map cellList = new HashMap<>();// public Game(Room room) { @@ -47,8 +47,12 @@ // drawingController = new DrawingController(room, room.getMembers(), this); - for(int i=0; i<16; i++){ + for(int i=0; i<16; i++){//Cellのインスタンス作成 Cell c = new Cell(); + cellList.put(i, c); + c.setCno(i); + c.setColor(color.get(i)); + c.setDno(map.get(i)); } } @@ -115,7 +119,7 @@ this.turnList.add(nowTurn); } - public static Turn getTurn(Integer num){ + public Turn getTurn(Integer num){ return turnList.get(num); } }