diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java
index cfaa6bf..20a5872 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Room.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Room.java
@@ -13,7 +13,7 @@
         //String rid = null;
 
         @JsonProperty("state")
-        public int state;
+        private int state;
         //int state;
 
         @JsonProperty("ownerName")
@@ -137,10 +137,6 @@
 
         }
 
-        public Game createGame(String owner) {
-                game=new Game(this);
-                return game;
-        }
 
         public Game getGame() {
                 return game;
@@ -165,6 +161,13 @@
                 return state;
         }
 
+        public void setState(int state){
+                this.state=state;
+                if(state==2) {
+                        game = new Game(this);
+                }
+        }
+
         public void changeState(){
                 state += 1;
         }
diff --git a/src/main/java/com/ntlab/irisserver/resources/StateRest.java b/src/main/java/com/ntlab/irisserver/resources/StateRest.java
index fabad30..411ba70 100644
--- a/src/main/java/com/ntlab/irisserver/resources/StateRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/StateRest.java
@@ -28,7 +28,7 @@
             throw new WebApplicationException(response.build());
         }
 
-        return room.state; //部屋の情報を送る
+        return room.getState(); //部屋の情報を送る
     }
 //----------------------------------------------------------------------------------------------------------------------------------
     @PUT//部屋の情報を変更する
@@ -42,9 +42,9 @@
         Room room = rm.getRoom(rid);
 
         if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合
-            room.state = state; //部屋の情報を変更
+            room.setState(state); //部屋の情報を変更
         }
     }
 
 
-}
\ No newline at end of file
+}