Commit 034855a0 authored by Stephen's avatar Stephen
Browse files

Merged

parents 130ed454 ff3a8055
......@@ -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"));
......
......@@ -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];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment