diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java index 7f2e750..b160d4b 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Room.java +++ b/src/main/java/com/ntlab/irisserver/entities/Room.java @@ -50,7 +50,8 @@ public List getMembers() { - return new ArrayList(members.values()); + List memberslist = new ArrayList(members.values()) ; + return memberslist; } @@ -120,7 +121,8 @@ } public Member getMember(String nick) { - return members.get(nick); + Member m = members.get(nick); + return m; } public void addMember(String nick){ @@ -132,13 +134,15 @@ return 0; } + public Room(){ + drawingTimer = false; + drawingTimerTimes = 0; + gameTimer = true; + gameTimerTimes = 30; + gameTimerFirstThinkingTimes = 10; + } public Room(String rid, String owner) { - drawingTimer = false; - drawingTimerTimes = 0; - gameTimer = true; - gameTimerTimes = 30; - gameTimerFirstThinkingTimes = 10; this.rid=rid; ownerName=owner; }