diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java index 8408f11..b160d4b 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Room.java +++ b/src/main/java/com/ntlab/irisserver/entities/Room.java @@ -40,8 +40,10 @@ public int gameTimerFirstThinkingTimes; //int gameTimerFirstThinkingTimes; - - + @JsonProperty("RedMaster") + private Member RedMaster; + @JsonProperty("BlueMaster") + private Member BlueMaster; Map members= new HashMap<>(); Map drawings = new HashMap<>(); @@ -53,13 +55,16 @@ } - public void changeTeamAndMaster(String nick, String belongs, boolean isMaster) { - //上に追加するもの - Member RedMaster = null; - Member BlueMaster = null; + public List getDrawings() { - //この関数のコメント - //プレイヤーの情報を変更する + List drawingslist = new ArrayList(drawings.values()) ; + return drawingslist; + + } + + //プレイヤーの情報を変更する + public void changeTeamAndMaster(String nick, String belongs, boolean isMaster) { + //変更対象の情報を取得 Member m = members.get(nick); @@ -190,4 +195,5 @@ } + }