Merged

src/client/src/tcpclient/MainPage.java

@@ -2267,8 +2267,8 @@ public class MainPage extends javax.swing.JFrame {
                 String name = response.getString("name");
                 mapLabel.setText("Map: "+name);
                 
-                int dimX=response.getInt("width")+5;
-                int dimY=response.getInt("height")+9;
+                int dimX=response.getInt("width");
+                int dimY=response.getInt("height");
                 mapModel=new MapTableModel(dimX, dimY);
                
                 ImageIcon playerIcon = new ImageIcon(getClass().getResource("images/player.png"));

src/server/src/tcpserver/TCPServer.java

@@ -40,7 +40,6 @@ public class TCPServer implements Runnable {
         serverPort = 6789;
         serverClientSocket = new ServerSocket(serverPort);
         servers = new ArrayList<Host>();
-
         thisIP = "167.205.71.56";
         sql = new MySQLAccess();
         findOfferTimes = new String[10];