diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java
index 307a1fb..145b2b0 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Game.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Game.java
@@ -19,7 +19,6 @@
     private Settings settings = null;
 
     public Game(Room room) {
-
         List<Member> memberList = room.getMembers();
         int num = 16/memberList.size();//一人あたりが確実に採用されるイラスト枚数
         int cnt = 0;
@@ -43,7 +42,6 @@
 
         for(int i=0; i<16; i++) map.add(i);
         Collections.shuffle(map);//0～15のdnoをランダムにマップに割り振る
-
         //r:6 b:5 g:4 d:1
         for(int i=0; i<6; i++) color.add("r");
         for(int i=0; i<5; i++) color.add("b");
@@ -51,8 +49,8 @@
         color.add("d");
         Collections.shuffle(color);//r,b,g,dをランダムにマップに割り振る
 
-        drawingController = new DrawingController(room, room.getMembers(), this);
         this.settings = room.getSettings();
+        drawingController = new DrawingController(room, room.getMembers(), this);
 
         //Cellのインスタンス作成
         for(int i=0; i<16; i++){