diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index f7903ef..b3b1a00 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -23,7 +23,7 @@ private List turnList = new ArrayList<>(); @JsonProperty("nowTurn") - private Turn nowTurn = null;//現在のターン + private Turn nowTurn = new Turn(); //現在のターン @JsonProperty("drawingController") private DrawingController drawingController = null; @JsonProperty("settings") diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index 01765ad..de0e2ed 100644 --- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java +++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java @@ -12,7 +12,7 @@ public class HelloWorld { @GET public String getHello() { - return "Hello World!(WebSocketバージョン)。12/11-10:32"; + return "Hello World!(WebSocketバージョン)。12/11-10:48"; } } diff --git a/src/main/java/com/ntlab/irisserver/resources/TestRest.java b/src/main/java/com/ntlab/irisserver/resources/TestRest.java index f923799..fdcbcb9 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TestRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TestRest.java @@ -62,7 +62,7 @@ } String[] keywords = km.getKeywords(path); Game dgame = new Game(dr, keywords); - //Game game = new Game(gr, keywords); + Game game = new Game(gr, keywords); //gametest部屋:絵の格納 for(int i = 0; i < 16; i++){ @@ -121,9 +121,9 @@ } draw.setDrawing(path); if(i<8){ - //game.putDrawing(i*2, draw); + game.putDrawing(i*2, draw); }else{ - //game.putDrawing(i*2-15, draw); + game.putDrawing(i*2-15, draw); } }