Commit: 2c53eb3d74a11dee46f2f45098c815244a7a5284 - HotshotServer (hg)

Commit MetaInfo

• Revision: 2c53eb3d74a11dee46f2f45098c815244a7a5284 (tree)
• Time: 2019-01-18 05:20:32
• Author: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Log Message

Fixed loading the saved ServerTable in the same session.

Change Summary

• modified: .idea/modules/BlackholeDarksunServer2_main.iml
• modified: .idea/modules/BlackholeDarksunServer2_test.iml
• modified: .idea/workspace.xml
• modified: src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java

Incremental Difference

diff -r 9d4aaac81a32 -r 2c53eb3d74a1 .idea/modules/BlackholeDarksunServer2_main.iml
--- a/.idea/modules/BlackholeDarksunServer2_main.iml	Wed Nov 21 22:27:09 2018 +0200
+++ b/.idea/modules/BlackholeDarksunServer2_main.iml	Thu Jan 17 22:20:32 2019 +0200
@@ -34,15 +34,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/okhttp-3.11.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/../../lib/GoogleAdMobAdsSdk-6.2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -52,33 +43,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/okio-2.1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/kryonet.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jsr305-1.3.9.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/../../lib/FlurryAgent.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -97,12 +61,48 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/okio-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
           <root url="jar://$MODULE_DIR$/../../lib/sensorsimulator-lib-2.0-rc1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/okhttp-3.11.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/kryonet.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/jsr305-1.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Gradle: com.badlogicgames.gdx:gdx-ai:1.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.badlogicgames.gdx:gdx-tools:1.9.1" level="project" />
     <orderEntry type="library" name="Gradle: com.badlogicgames.gdx:gdx-freetype:1.9.1" level="project" />

diff -r 9d4aaac81a32 -r 2c53eb3d74a1 .idea/modules/BlackholeDarksunServer2_test.iml
--- a/.idea/modules/BlackholeDarksunServer2_test.iml	Wed Nov 21 22:27:09 2018 +0200
+++ b/.idea/modules/BlackholeDarksunServer2_test.iml	Thu Jan 17 22:20:32 2019 +0200
@@ -19,15 +19,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/okhttp-3.11.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/../../lib/okio-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -37,33 +28,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/FlurryAgent.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/jsr305-1.3.9.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/GoogleAdMobAdsSdk-6.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/../../lib/sensorsimulator-lib-2.0-rc1.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -82,6 +46,15 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/FlurryAgent.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
           <root url="jar://$MODULE_DIR$/../../lib/mchange-commons-java-0.2.8.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -97,6 +70,33 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/okhttp-3.11.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/jsr305-1.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/GoogleAdMobAdsSdk-6.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Gradle: com.badlogicgames.gdx:gdx-ai:1.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.badlogicgames.gdx:gdx-tools:1.9.1" level="project" />
     <orderEntry type="library" name="Gradle: com.badlogicgames.gdx:gdx-freetype:1.9.1" level="project" />

diff -r 9d4aaac81a32 -r 2c53eb3d74a1 .idea/workspace.xml
--- a/.idea/workspace.xml	Wed Nov 21 22:27:09 2018 +0200
+++ b/.idea/workspace.xml	Thu Jan 17 22:20:32 2019 +0200
@@ -7,9 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7105e4c6-0867-4f2c-a066-e5ce5581c80a" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/BlackholeDarksunServer2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/BlackholeDarksunServer2_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" afterDir="false" />
     </list>
     <ignored path="BlackholeDarksunServer2.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -62,51 +63,6 @@
       </state>
     </system>
   </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-890822262">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="6" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.5" value="1" />
-          <entry key="project.opened" value="10" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="gradle" value="76" />
-          <entry key="java" value="303" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="9" />
-          <entry key="Groovy" value="2" />
-          <entry key="JAVA" value="133" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="9" />
-          <entry key="gradle" value="2" />
-          <entry key="java" value="133" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="Groovy" value="76" />
-          <entry key="JAVA" value="303" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-    </session>
-  </component>
   <component name="FavoritesManager">
     <favorites_list name="BlackholeDarksunServer2" />
   </component>
@@ -115,12 +71,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="52" column="21" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
-              <folding>
-                <element signature="e#2292#2293#0" expanded="true" />
-                <element signature="e#2320#2321#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="538">
+              <caret line="58" column="27" selection-start-line="58" selection-start-column="27" selection-end-line="58" selection-end-column="27" />
             </state>
           </provider>
         </entry>
@@ -128,7 +80,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
+            <state relative-caret-position="629">
               <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
             </state>
           </provider>
@@ -137,8 +89,48 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="377">
-              <caret line="64" selection-start-line="64" selection-end-line="64" />
+            <state relative-caret-position="399">
+              <caret line="126" selection-start-line="126" selection-end-line="126" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/ConnectServerTask.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
+              <folding>
+                <element signature="e#653#654#0" expanded="true" />
+                <element signature="e#699#700#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/IClientAPIResponseProvider.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ClientAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="425">
+              <caret line="35" column="26" selection-start-line="35" selection-start-column="26" selection-end-line="35" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/UpdateServerTask.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="9" column="22" lean-forward="true" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -146,9 +138,10 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-187">
-              <caret line="37" selection-start-line="37" selection-end-line="37" />
+            <state relative-caret-position="77">
+              <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
               <folding>
+                <element signature="e#759#760#0" expanded="true" />
                 <element signature="e#803#804#0" expanded="true" />
               </folding>
             </state>
@@ -158,9 +151,11 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2117">
-              <caret line="174" column="20" selection-start-line="174" selection-start-column="20" selection-end-line="174" selection-end-column="20" />
+            <state relative-caret-position="215">
+              <caret line="167" column="23" selection-start-line="167" selection-start-column="23" selection-end-line="167" selection-end-column="23" />
               <folding>
+                <element signature="e#6653#6654#0" expanded="true" />
+                <element signature="e#6687#6688#0" expanded="true" />
                 <element signature="e#6896#6897#0" expanded="true" />
                 <element signature="e#6934#6935#0" expanded="true" />
               </folding>
@@ -182,221 +177,9 @@
       <find>154083944</find>
       <find>D3D11 : Created D3D11 Rendering Window 'MainRenderWindow'</find>
       <find>native-ser</find>
+      <find>save(</find>
     </findStrings>
   </component>
-  <component name="GradleLocalSettings">
-    <option name="myGradleHomes">
-      <map>
-        <entry key="$PROJECT_DIR$" value="C:\Users\sebas\.gradle\wrapper\dists\gradle-4.8-bin\divx0s2uj4thofgytb7gf9fsi\gradle-4.8" />
-      </map>
-    </option>
-    <option name="myGradleVersions">
-      <map>
-        <entry key="$PROJECT_DIR$" value="4.8" />
-      </map>
-    </option>
-    <option name="availableProjects">
-      <map>
-        <entry>
-          <key>
-            <ExternalProjectPojo>
-              <option name="name" value="BlackholeDarksunServer2" />
-              <option name="path" value="$PROJECT_DIR$" />
-            </ExternalProjectPojo>
-          </key>
-          <value>
-            <list>
-              <ExternalProjectPojo>
-                <option name="name" value="BlackholeDarksunServer2" />
-                <option name="path" value="$PROJECT_DIR$" />
-              </ExternalProjectPojo>
-            </list>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="availableTasks">
-      <map>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <list>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the components produced by root project 'BlackholeDarksunServer2'. [incubating]" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="components" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="buildDependents" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the sub-projects of root project 'BlackholeDarksunServer2'." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="projects" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles main classes." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="classes" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the dependent components of components in root project 'BlackholeDarksunServer2'. [incubating]" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="dependentComponents" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays all buildscript dependencies declared in root project 'BlackholeDarksunServer2'." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="buildEnvironment" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Generates Gradle wrapper files." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="wrapper" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles test classes." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="testClasses" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Generates Javadoc API documentation for the main source code." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="javadoc" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles a jar archive containing the main classes." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="jar" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the configuration model of root project 'BlackholeDarksunServer2'. [incubating]" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="model" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Processes main resources." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processResources" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the tasks runnable from root project 'BlackholeDarksunServer2'." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="tasks" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Initializes a new Gradle build." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="init" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Runs the unit tests." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="test" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Compiles main Java source." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileJava" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the insight into a specific dependency in root project 'BlackholeDarksunServer2'." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="dependencyInsight" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Runs all checks." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="check" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles the outputs of this project." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="assemble" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Deletes the build directory." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="clean" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Compiles test Java source." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileTestJava" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays all dependencies declared in root project 'BlackholeDarksunServer2'." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="dependencies" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Processes test resources." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processTestResources" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays a help message." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="help" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="build" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects it depends on." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="buildNeeded" />
-              </ExternalTaskPojo>
-              <ExternalTaskPojo>
-                <option name="description" value="Displays the properties of root project 'BlackholeDarksunServer2'." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="properties" />
-              </ExternalTaskPojo>
-            </list>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="modificationStamps">
-      <map>
-        <entry key="$PROJECT_DIR$/../BlackholeDarksunOnline2" value="10023978603435" />
-        <entry key="$PROJECT_DIR$/../BlackholeDarksunOnline3" value="10093996214324" />
-        <entry key="$PROJECT_DIR$" value="3084463796576" />
-        <entry key="$PROJECT_DIR$/.gradle" value="0" />
-        <entry key="$PROJECT_DIR$/build.gradle" value="2171214138" />
-      </map>
-    </option>
-    <option name="projectBuildClasspath">
-      <map>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <ExternalProjectBuildClasspathPojo>
-              <option name="modulesBuildClasspath">
-                <map>
-                  <entry key="$PROJECT_DIR$">
-                    <value>
-                      <ExternalModuleBuildClasspathPojo>
-                        <option name="path" value="$PROJECT_DIR$" />
-                      </ExternalModuleBuildClasspathPojo>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="name" value="BlackholeDarksunServer2" />
-            </ExternalProjectBuildClasspathPojo>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="projectSyncType">
-      <map>
-        <entry key="$PROJECT_DIR$" value="RE_IMPORT" />
-      </map>
-    </option>
-  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -413,12 +196,6 @@
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
@@ -500,6 +277,14 @@
               <item name="BlackholeDarksunServer2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
               <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
               <item name="headwayEnt" type="462c0819:PsiDirectoryNode" />
+              <item name="ClientAPI" type="462c0819:PsiDirectoryNode" />
+              <item name="Tables" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="BlackholeDarksunServer2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="BlackholeDarksunServer2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="headwayEnt" type="462c0819:PsiDirectoryNode" />
               <item name="Server" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -528,7 +313,7 @@
     <property name="SearchEverywhereHistoryKey" value="mai&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_MainThread.java&#10;renderthre&#9;PSI&#9;JAVA://headwayent.hotshotengine.renderer.nativeinterface.pipeline.ENG_RenderingThread&#10;datase&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java&#10;mainthre&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_MainThread.java&#10;server&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java&#10;multi&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java&#10;justadded&#9;PSI&#9;JAVA://headwayent.blackholedarksun.multiplayer.components.PlayerState#justAdded&#10;JoinReq&#9;PSI&#9;JAVA://headwayent.blackholedarksun.net.registeredclasses.JoinServerConnectionRequest&#10;multiplayerfra&#9;PSI&#9;JAVA://headwayent.blackholedarksun.multiplayer.MultiplayerFrame&#10;worldmanagerser&#9;PSI&#9;JAVA://headwayent.blackholedarksun.world.WorldManagerServerSide&#10;movementsys&#9;PSI&#9;JAVA://headwayent.blackholedarksun.systems.MovementSystem&#10;servers&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java&#10;entitymot&#9;PSI&#9;JAVA://headwayent.blackholedarksun.physics.EntityMotionState&#10;entityconta&#9;PSI&#9;JAVA://headwayent.blackholedarksun.physics.EntityContactListener&#10;mul&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java&#10;multiplayerga&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/_core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java&#10;worldma&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java&#10;multiplayerentityud&#9;PSI&#9;JAVA://headwayent.blackholedarksun.multiplayer.components.MultiplayerEntityUDP&#10;datasend&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java&#10;serverside&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java&#10;multipla&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java&#10;NetMa&#9;PSI&#9;JAVA://headwayent.blackholedarksun.net.NetManager&#10;Multi&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java&#10;ServerV&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java&#10;Worl&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java&#10;c&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java&#10;Sender&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java&#10;ClientLi&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java&#10;Coll&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/CollisionDetectionSystem.java&#10;PortalEn&#9;PSI&#9;JAVA://headwayent.blackholedarksun.animations.PortalEnteringWithoutRenderingAnimation&#10;respaw&#9;PSI&#9;JAVA://headwayent.blackholedarksun.world.WorldManagerServerSide.PlayerRespawnData&#10;Multip&#9;FILE&#9;jar://C:/Sebi/projects/BlackholeDarksunServer2/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java&#10;ClientLis&#9;PSI&#9;JAVA://headwayent.blackholedarksun.net.ClientListener" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542831960318" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547755907133" />
     <property name="dynamic.classpath" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/res" />
     <property name="options.lastSelected" value="preferences.pluginManager" />
@@ -770,7 +555,7 @@
       <option name="USE_KEYWORD" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
+    <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -822,6 +607,7 @@
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
     <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
@@ -840,7 +626,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
+    <configuration default="true" type="TestNG">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <properties />
       <listeners />
@@ -848,7 +634,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+    <configuration default="true" type="js.build_tools.gulp">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <gulpfile />
@@ -906,16 +692,20 @@
       <workItem from="1540579349485" duration="19497000" />
       <workItem from="1541454320550" duration="1110000" />
       <workItem from="1541715955328" duration="22755000" />
-      <workItem from="1542233822045" duration="9665000" />
+      <workItem from="1542233822045" duration="11262000" />
+      <workItem from="1543776114069" duration="606000" />
+      <workItem from="1545333253826" duration="619000" />
+      <workItem from="1546691612873" duration="599000" />
+      <workItem from="1546886309353" duration="1812000" />
+      <workItem from="1547228286647" duration="5424000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="208265000" />
+    <option name="totallyTimeSpent" value="218922000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="UI Designer" order="0" />
       <window_info id="Palette&#9;" order="1" />
@@ -924,7 +714,7 @@
       <window_info id="Capture Tool" order="4" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Web" order="6" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="7" sideWeight="0.4940171" visible="true" weight="0.21002132" />
+      <window_info content_ui="combo" id="Project" order="7" sideWeight="0.4940171" visible="true" weight="0.22068231" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.46801707" weight="0.31538463" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.32857144" />
@@ -944,6 +734,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" sideWeight="0.53198296" side_tool="true" weight="0.32405347" />
       <window_info anchor="bottom" id="Build" order="17" weight="0.32857144" />
       <window_info anchor="bottom" id="Database Changes" order="18" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Docker" order="19" show_stripe_button="false" />
       <window_info anchor="right" id="Database" order="0" weight="0.32995737" />
       <window_info anchor="right" id="Gradle" order="1" weight="0.19189766" />
       <window_info anchor="right" id="Designer" order="2" />
@@ -957,6 +748,7 @@
       <window_info anchor="right" id="Ant Build" order="10" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="11" sideWeight="0.49744463" visible="true" weight="0.17110874" />
       <window_info anchor="right" id="Structure" order="12" sideWeight="0.5025554" weight="0.17110874" />
+      <window_info anchor="right" id="Maven" order="13" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -970,9 +762,6 @@
       <collection />
     </option>
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -1026,7 +815,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java</url>
-          <line>559</line>
+          <line>630</line>
           <properties />
           <option name="timeStamp" value="70" />
         </line-breakpoint>
@@ -1062,7 +851,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java</url>
-          <line>315</line>
+          <line>316</line>
           <properties />
           <option name="timeStamp" value="84" />
         </line-breakpoint>
@@ -1079,15 +868,24 @@
           <option name="timeStamp" value="86" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java</url>
+          <line>116</line>
+          <properties />
+          <option name="timeStamp" value="88" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java</url>
-          <line>64</line>
+          <line>126</line>
           <properties />
           <option name="timeStamp" value="89" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java</url>
+          <line>120</line>
+          <properties />
+          <option name="timeStamp" value="90" />
+        </line-breakpoint>
       </breakpoints>
-      <breakpoints-dialog>
-        <breakpoints-dialog />
-      </breakpoints-dialog>
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1095,35 +893,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerBase.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20213">
-          <caret line="1250" column="30" selection-start-line="1250" selection-start-column="30" selection-end-line="1250" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/MultiplayerFrame.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/UDPBreaker.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="30" column="12" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/_core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java" />
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/components/PlayerState.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="38" column="26" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/registeredclasses/JoinServerConnectionRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="561">
@@ -1131,13 +900,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/UpdateServerTask.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="493">
@@ -1366,10 +1128,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
           <caret line="2567" column="23" selection-start-line="2567" selection-start-column="23" selection-end-line="2567" selection-end-column="23" />
-          <folding>
-            <element signature="e#88808#88809#0" expanded="true" />
-            <element signature="e#88857#88858#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1442,58 +1200,99 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_144/javafx-src.zip!/javafx/application/Application.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3672">
+          <caret line="353" column="28" selection-start-line="353" selection-start-column="28" selection-end-line="353" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
+        <state relative-caret-position="629">
           <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_144/javafx-src.zip!/javafx/application/Application.java">
+    <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/IClientAPIResponseProvider.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3672">
-          <caret line="353" column="28" selection-start-line="353" selection-start-column="28" selection-end-line="353" selection-end-column="28" />
+        <state relative-caret-position="221">
+          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ClientAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="35" column="26" selection-start-line="35" selection-start-column="26" selection-end-line="35" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_144/javafx-src.zip!/javafx/concurrent/Task.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="618" column="22" selection-start-line="618" selection-start-column="22" selection-end-line="618" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/UpdateServerTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="9" column="22" lean-forward="true" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="538">
+          <caret line="58" column="27" selection-start-line="58" selection-start-column="27" selection-end-line="58" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/ConnectServerTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
           <folding>
-            <element signature="e#12081#12082#0" expanded="true" />
-            <element signature="e#12138#12139#0" expanded="true" />
+            <element signature="e#653#654#0" expanded="true" />
+            <element signature="e#699#700#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2117">
-          <caret line="174" column="20" selection-start-line="174" selection-start-column="20" selection-end-line="174" selection-end-column="20" />
+        <state relative-caret-position="215">
+          <caret line="167" column="23" selection-start-line="167" selection-start-column="23" selection-end-line="167" selection-end-column="23" />
           <folding>
+            <element signature="e#6653#6654#0" expanded="true" />
+            <element signature="e#6687#6688#0" expanded="true" />
             <element signature="e#6896#6897#0" expanded="true" />
             <element signature="e#6934#6935#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_144/src.zip!/java/util/prefs/Preferences.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="52" column="21" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
-          <folding>
-            <element signature="e#2292#2293#0" expanded="true" />
-            <element signature="e#2320#2321#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="3145">
+          <caret line="223" column="22" selection-start-line="223" selection-start-column="22" selection-end-line="223" selection-end-column="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="64" selection-start-line="64" selection-end-line="64" />
+        <state relative-caret-position="399">
+          <caret line="126" selection-start-line="126" selection-end-line="126" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-187">
-          <caret line="37" selection-start-line="37" selection-end-line="37" />
+        <state relative-caret-position="77">
+          <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
           <folding>
+            <element signature="e#759#760#0" expanded="true" />
             <element signature="e#803#804#0" expanded="true" />
           </folding>
         </state>

diff -r 9d4aaac81a32 -r 2c53eb3d74a1 src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java
--- a/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java	Wed Nov 21 22:27:09 2018 +0200
+++ b/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java	Thu Jan 17 22:20:32 2019 +0200
@@ -111,10 +111,13 @@
             return;
         }
         setTexts(gameServer, GameServer.ConnectionStatus.CONNECTING);
-        ServerTable serverTable = new ServerTable();
-        serverTable.setServerName(serverName);
-        serverTable.setTcpPort(String.valueOf(gameServer.getTcpPort()));
-        serverTable.setUdpPort(String.valueOf(gameServer.getUdpPort()));
+        ServerTable serverTable = ServerTable.load();
+        if (serverTable == null) {
+            serverTable = new ServerTable();
+            serverTable.setServerName(serverName);
+            serverTable.setTcpPort(String.valueOf(gameServer.getTcpPort()));
+            serverTable.setUdpPort(String.valueOf(gameServer.getUdpPort()));
+        }
         connectServerTask = new ConnectServerTask(serverTable);
         connectServerTask.setOnSucceeded(event1 -> {
             ServerTable serverTableResult = connectServerTask.getValue();