Updated

src/server/nbproject/private/private.xml

@@ -3,15 +3,9 @@
     <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/Stephen/Documents/NetBeansProjects/TubesSister/src/server/src/tcpserver/TCPServer.java</file>
             <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/server/src/tcpserver/Host.java</file>
             <file>file:/C:/Users/Stephen/Documents/NetBeansProjects/TubesSister/src/server/src/tcpserver/MySQLAccess.java</file>
-=======
-            <file>file:/D:/IF3230-Tugas-Besar-Sister-2015/src/server/map.txt</file>
-            <file>file:/D:/IF3230-Tugas-Besar-Sister-2015/src/server/src/tcpserver/MySQLAccess.java</file>
-            <file>file:/D:/IF3230-Tugas-Besar-Sister-2015/src/server/src/tcpserver/TCPServer.java</file>
->>>>>>> f5cc2615451f416ad94e5b85c35aa84513a123d3
         </group>
     </open-files>
 </project-private>

src/server/src/tcpserver/TCPServer.java

@@ -231,21 +231,21 @@ public class TCPServer implements Runnable {
         // Test join tracker, ambil ip dari wifi
         boolean joined = false;
         int count = 1;
-        do {
+        //do {
             try {
-                join("192.168.1.107", 6790);
+                join("192.168.1.106", 6777);
                 joined = true;
             } catch(Exception e) {
-                System.out.println(count + ". Tracker not responding, retrying in 5 seconds");
-                count++;
-                try {
-                    Thread.sleep(5000);
-                } catch (Exception ex) {}
+//                System.out.println(count + ". Tracker not responding, retrying in 5 seconds");
+//                count++;
+//                try {
+//                    Thread.sleep(5000);
+//                } catch (Exception ex) {}
             }
-        } while(!joined);
+        //} while(!joined);
 
         while(true) {
-            int port = 6790;
+            int port = 6777;
             try {
                 // Menunggu koneksi dari tracker
                 serverTrackerSocket = new ServerSocket(port);