diff --git a/src/main/java/com/ntlab/irisserver/entities/DrawingController.java b/src/main/java/com/ntlab/irisserver/entities/DrawingController.java new file mode 100644 index 0000000..14375da --- /dev/null +++ b/src/main/java/com/ntlab/irisserver/entities/DrawingController.java @@ -0,0 +1,18 @@ +package com.ntlab.irisserver.entities; + +public class DrawingController { + + private int stage = 0; + private Game game; + + public DrawingController(Game game) { + this.game = game; + } + + public void update(){} + + public int getStage(){ + return stage; + } + +} diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java index 9724813..1deb1f7 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Room.java +++ b/src/main/java/com/ntlab/irisserver/entities/Room.java @@ -56,6 +56,14 @@ } + public void setRedMaster(Member redMaster) { + this.redMaster = redMaster; + } + + public void setBlueMaster(Member blueMaster) { + this.blueMaster = blueMaster; + } + //プレイヤーの情報を変更する public void changeTeamAndMaster(String nick, String belongs, boolean isMaster) { diff --git a/src/main/java/com/ntlab/irisserver/resources/MembersRest.java b/src/main/java/com/ntlab/irisserver/resources/MembersRest.java index 913baa4..ece40b5 100644 --- a/src/main/java/com/ntlab/irisserver/resources/MembersRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/MembersRest.java @@ -18,6 +18,8 @@ public class MembersRest { public static void membershuffle(List m) { + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); //List<Member>をshuffleする Collections.shuffle(m); @@ -40,8 +42,13 @@ //Listの偶数番目を"r"(赤)に、奇数番目を"b"(青)にする if(i % 2 == 0){ info.setBelongs("r"); + room.setRedMaster(info); + + }else{ info.setBelongs("b"); + room.setBlueMaster(info); + } }