push

Author: mojo-izadi

src/main/java/controller/ClientDataController.java

@@ -52,6 +52,8 @@ public class ClientDataController {
             return LobbyHandler.getInstance().run(user, data.getMessage());
         } else if (menuName.matches("duel")){
             return GameGraphicController.run(user, data.getMessage());
+        } else if (menuName.matches("Chat Menu")){
+            return ChatRoomController.run(user, data.getMessage());
         }
 
         return Utils.getDataSendToClientForInvalidInput();

src/main/java/model/Data/DataForClientFromServer.java

@@ -9,7 +9,7 @@ public class DataForClientFromServer {
 
     private String message;
     private MessageType messageType;
-    private ArrayList<String> messages;
+    private ArrayList<String> messages = new ArrayList<>();
     public ArrayList<DataFromGameRun> gameGraphicData = null;
 
     public DataForClientFromServer(ArrayList<DataFromGameRun> gameGraphicData){