diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java index 2e891d7..fc9d96a 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Room.java +++ b/src/main/java/com/ntlab/irisserver/entities/Room.java @@ -17,13 +17,15 @@ public String ownerName; //String ownerName = null; + @JsonProperty("members") + Map members= new HashMap<>(); + + @JsonProperty("settings") + Settings settings = new Settings(); private Member redMaster; private Member blueMaster; - Map members= new HashMap<>(); - Map drawings = new HashMap<>(); - Settings settings = new Settings(); public Room(String rid, String owner) { @@ -42,13 +44,6 @@ } - public List getDrawings() { - - List drawingslist = new ArrayList(drawings.values()) ; - return drawingslist; - - } - //プレイヤーの情報を変更する public void changeTeamAndMaster(String nick, String belongs, boolean isMaster) { @@ -134,13 +129,4 @@ return 0; } - - public Drawing getDrawing(int dno) { - return drawings.get(dno); - } - - public void putDrawing(int dno, Drawing d) { - drawings.put(dno, d); - } - }