Updated

src/client/nbproject/private/private.properties

 compile.on.save=true
 
-user.properties.file=C:\\Users\\susanti_2\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+user.properties.file=C:\\Users\\Stephen\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties

src/client/nbproject/private/private.xml

@@ -3,8 +3,10 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/susanti_2/Documents/ITB/IF/netbeans/IF3230-Tugas-Besar-Sister-2015/src/client/src/tcpclient/MainPage.java</file>
-            <file>file:/C:/Users/susanti_2/Documents/ITB/IF/netbeans/IF3230-Tugas
+            <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/client/src/tcpclient/LoginPanel.java</file>
+            <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/client/src/tcpclient/TradeboxTableModel.java</file>
+            <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/client/src/tcpclient/MainPage.java</file>
+            <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/client/src/tcpclient/TCPClient.java</file>
         </group>
     </open-files>
 </project-private>

src/server/build/built-jar.properties

-<<<<<<< HEAD
-#Fri, 24 Apr 2015 15:40:25 +0700
-=======
-#Fri, 24 Apr 2015 15:40:37 +0700
->>>>>>> e4457f5f5bf18c35d13041513c5e876949f2ae72
+#Sun, 26 Apr 2015 14:21:29 +0700
 
 
-C\:\\Users\\susanti_2\\Documents\\ITB\\IF\\netbeans\\IF3230-Tugas-Besar-Sister-2015\\src\\server=
+C\:\\Users\\Stephen\\Documents\\NetBeansProjects\\TubesSister\\src\\server=

src/server/nbproject/private/private.xml

@@ -3,12 +3,8 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-<<<<<<< HEAD
-            <file>file:/C:/Users/susanti_2/Documents/ITB/IF/netbeans/IF3230-Tugas-Besar-Sister-2015/src/server/src/tcpserver/TCPServer.java</file>
-=======
             <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/server/src/tcpserver/TCPServer.java</file>
             <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/server/src/tcpserver/MySQLAccess.java</file>
->>>>>>> e4457f5f5bf18c35d13041513c5e876949f2ae72
         </group>
     </open-files>
 </project-private>

src/server/src/tcpserver/MySQLAccess.java

@@ -2,6 +2,7 @@ package tcpserver;
 
 import java.io.FileReader;
 import java.io.InputStream;
+import static java.lang.Math.abs;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.SecureRandom;
@@ -247,7 +248,7 @@ public class MySQLAccess {
                     System.out.println(preparedStatement.toString());
                     preparedStatement.executeUpdate();
                     response.put("status", "ok");
-                    response.put("time", System.currentTimeMillis()/1000 + 5);
+                    response.put("time", System.currentTimeMillis()/1000 + (5*abs(curr_x-x)) + (5*abs(curr_y-y)));
                     //barang menjadi ada lagi karena berpindah tempat
                     ada = true;
                 }

src/server/src/tcpserver/TCPServer.java

@@ -41,7 +41,7 @@ public class TCPServer implements Runnable {
         serverClientSocket = new ServerSocket(serverPort);
         servers = new ArrayList<Host>();
 
-        thisIP = "167.205.34.248";
+        thisIP = "167.205.71.56";
         sql = new MySQLAccess();
         findOfferTimes = new String[10];
         for(int i=0; i<10; i++) {