Commit: 86f56edd56f1b548a6a1d68055fca2187f3f0760 - HotshotServer (hg)

Commit MetaInfo

• Revisão: 86f56edd56f1b548a6a1d68055fca2187f3f0760 (tree)
• Hora: 2019-01-30 05:20:19
• Autor: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Mensagem de Log

Added spawn points selection.

Mudança Sumário

• modified: .idea/workspace.xml
• modified: raw/hotshot_gamedata/level_multiplayer_map0.txt

Diff

diff -r 2c53eb3d74a1 -r 86f56edd56f1 .idea/workspace.xml
--- a/.idea/workspace.xml	Thu Jan 17 22:20:32 2019 +0200
+++ b/.idea/workspace.xml	Tue Jan 29 22:20:19 2019 +0200
@@ -7,10 +7,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7105e4c6-0867-4f2c-a066-e5ce5581c80a" name="Default" comment="">
-      <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$/raw/hotshot_gamedata/level_multiplayer_map0.txt" beforeDir="false" afterPath="$PROJECT_DIR$/raw/hotshot_gamedata/level_multiplayer_map0.txt" afterDir="false" />
     </list>
     <ignored path="BlackholeDarksunServer2.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,96 +66,109 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java">
+        <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="538">
-              <caret line="58" column="27" selection-start-line="58" selection-start-column="27" selection-end-line="58" selection-end-column="27" />
+            <state relative-caret-position="119">
+              <caret line="7" column="51" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/build.gradle">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/registeredclasses/NetBase.java">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="-110">
+              <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java">
+        <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="399">
-              <caret line="126" selection-start-line="126" selection-end-line="126" />
+            <state relative-caret-position="283">
+              <caret line="94" column="48" selection-start-line="94" selection-start-column="48" selection-end-line="94" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/ConnectServerTask.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.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" />
+            <state relative-caret-position="190">
+              <caret line="1441" column="16" selection-start-line="1441" selection-start-column="16" selection-end-line="1441" selection-end-column="16" />
               <folding>
-                <element signature="e#653#654#0" expanded="true" />
-                <element signature="e#699#700#0" expanded="true" />
+                <element signature="e#8693#8694#0" expanded="true" />
+                <element signature="e#8730#8731#0" expanded="true" />
+                <element signature="e#8803#8804#0" expanded="true" />
+                <element signature="e#8846#8847#0" expanded="true" />
+                <element signature="e#8897#8898#0" expanded="true" />
+                <element signature="e#8933#8934#0" expanded="true" />
+                <element signature="e#8993#8994#0" expanded="true" />
+                <element signature="e#9042#9043#0" expanded="true" />
+                <element signature="e#13672#13673#0" expanded="true" />
+                <element signature="e#13726#13727#0" expanded="true" />
+                <element signature="e#23736#23737#0" expanded="true" />
+                <element signature="e#23791#23792#0" expanded="true" />
+                <element signature="e#25008#25009#0" expanded="true" />
+                <element signature="e#25044#25045#0" expanded="true" />
+                <element signature="e#37141#37142#0" expanded="true" />
+                <element signature="e#37193#37194#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">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/registeredclasses/ServerConnectionRequest.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 relative-caret-position="85">
+              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/UpdateServerTask.java">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.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>
-      </file>
-      <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="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 relative-caret-position="186">
+              <caret line="237" column="15" selection-start-line="237" selection-start-column="15" selection-end-line="237" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/levelresource/MultiplayerClientLevel.java">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="153">
+              <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/levelresource/MultiplayerClientLevelStart.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/levelresource/Level.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="68">
+              <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="630" selection-start-line="630" selection-end-line="630" />
             </state>
           </provider>
         </entry>
@@ -178,6 +188,8 @@
       <find>D3D11 : Created D3D11 Rendering Window 'MainRenderWindow'</find>
       <find>native-ser</find>
       <find>save(</find>
+      <find>-5</find>
+      <find>Adding pla</find>
     </findStrings>
   </component>
   <component name="IdeDocumentHistory">
@@ -313,7 +325,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="1547755907133" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548791578855" />
     <property name="dynamic.classpath" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/res" />
     <property name="options.lastSelected" value="preferences.pluginManager" />
@@ -697,15 +709,16 @@
       <workItem from="1545333253826" duration="619000" />
       <workItem from="1546691612873" duration="599000" />
       <workItem from="1546886309353" duration="1812000" />
-      <workItem from="1547228286647" duration="5424000" />
+      <workItem from="1547228286647" duration="22186000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="218922000" />
+    <option name="totallyTimeSpent" value="235684000" />
   </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" />
@@ -716,9 +729,9 @@
       <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.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 active="true" anchor="bottom" id="Find" order="1" sideWeight="0.46801707" visible="true" weight="0.31538463" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.32857144" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" visible="true" weight="0.35494506" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" weight="0.35494506" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.4978678" weight="0.32962137" />
@@ -850,40 +863,10 @@
           <option name="timeStamp" value="83" />
         </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>316</line>
-          <properties />
-          <option name="timeStamp" value="84" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_MainThread.java</url>
-          <line>177</line>
-          <properties />
-          <option name="timeStamp" value="85" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerApplication.java</url>
-          <line>29</line>
+          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java</url>
+          <line>93</line>
           <properties />
-          <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>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" />
+          <option name="timeStamp" value="92" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -893,49 +876,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="41" column="26" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
-        </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">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerMP.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="662" column="12" selection-start-line="662" selection-start-column="12" selection-end-line="662" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/_core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java" />
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_144/src.zip!/java/util/concurrent/CountDownLatch.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3230">
-          <caret line="229" column="16" selection-start-line="229" selection-start-column="16" selection-end-line="229" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/ServerGUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/gdx-bullet/1.9.1/b889e0f451bbc10c12e0c1b9dfbe41c9cd0cd011/gdx-bullet-1.9.1-sources.jar!/com/badlogic/gdx/physics/bullet/dynamics/DynamicsJNI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="480" column="33" selection-start-line="480" selection-start-column="33" selection-end-line="480" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/AsyncTask.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="186">
@@ -992,33 +932,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="1452" selection-start-line="1452" selection-end-line="1452" />
-          <folding>
-            <element signature="e#8693#8694#0" expanded="true" />
-            <element signature="e#8730#8731#0" expanded="true" />
-            <element signature="e#8803#8804#0" expanded="true" />
-            <element signature="e#8846#8847#0" expanded="true" />
-            <element signature="e#8897#8898#0" expanded="true" />
-            <element signature="e#8933#8934#0" expanded="true" />
-            <element signature="e#8993#8994#0" expanded="true" />
-            <element signature="e#9042#9043#0" expanded="true" />
-            <element signature="e#13672#13673#0" expanded="true" />
-            <element signature="e#13726#13727#0" expanded="true" />
-            <element signature="e#23736#23737#0" expanded="true" />
-            <element signature="e#23791#23792#0" expanded="true" />
-            <element signature="e#25008#25009#0" expanded="true" />
-            <element signature="e#25044#25045#0" expanded="true" />
-            <element signature="e#37141#37142#0" expanded="true" />
-            <element signature="e#37193#37194#0" expanded="true" />
-            <element signature="e#48077#48078#0" expanded="true" />
-            <element signature="e#48129#48130#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/DataSenderSystem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="178">
@@ -1117,13 +1030,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="52" column="20" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_Utility.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1131,75 +1037,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="382">
-          <caret line="559" selection-start-line="559" selection-end-line="559" />
-          <folding>
-            <element signature="e#8628#8629#0" expanded="true" />
-            <element signature="e#8688#8689#0" expanded="true" />
-            <element signature="e#9358#9359#0" expanded="true" />
-            <element signature="e#9416#9417#0" expanded="true" />
-            <element signature="e#10070#10071#0" expanded="true" />
-            <element signature="e#10126#10127#0" expanded="true" />
-            <element signature="e#10780#10781#0" expanded="true" />
-            <element signature="e#10836#10837#0" expanded="true" />
-            <element signature="e#24039#24040#0" expanded="true" />
-            <element signature="e#24088#24089#0" expanded="true" />
-            <element signature="e#25203#25204#0" expanded="true" />
-            <element signature="e#25235#25236#0" expanded="true" />
-            <element signature="e#25295#25296#0" expanded="true" />
-            <element signature="e#25358#25359#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="232" selection-start-line="232" selection-end-line="232" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_GameDescription.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="77" selection-start-line="77" selection-end-line="77" />
-          <folding>
-            <element signature="e#6145#6146#0" expanded="true" />
-            <element signature="e#6177#6178#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="98" selection-start-line="98" selection-end-line="98" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="29" selection-start-line="29" selection-end-line="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="315" selection-start-line="315" selection-end-line="315" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_MainThread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="331">
-          <caret line="186" column="35" selection-start-line="186" selection-start-column="35" selection-end-line="186" selection-end-column="35" />
-        </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">
@@ -1238,7 +1075,7 @@
     <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" />
+          <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
         </state>
       </provider>
     </entry>
@@ -1280,20 +1117,158 @@
         </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="264">
+          <caret line="116" selection-start-line="116" selection-end-line="116" />
+          <folding>
+            <element signature="e#759#760#0" expanded="true" />
+            <element signature="e#803#804#0" expanded="true" />
+          </folding>
+        </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="399">
+        <state relative-caret-position="654">
           <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">
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
+        <state relative-caret-position="195">
+          <caret line="316" selection-start-line="316" selection-end-line="316" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="31">
+          <caret line="21" column="98" selection-start-line="21" selection-start-column="98" selection-end-line="21" selection-end-column="98" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="98" selection-start-line="98" selection-end-line="98" />
           <folding>
-            <element signature="e#759#760#0" expanded="true" />
-            <element signature="e#803#804#0" expanded="true" />
+            <element signature="e#1344#1345#0" expanded="true" />
+            <element signature="e#1399#1400#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_GameDescription.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="77" selection-start-line="77" selection-end-line="77" />
+          <folding>
+            <element signature="e#6145#6146#0" expanded="true" />
+            <element signature="e#6177#6178#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="348">
+          <caret line="232" selection-start-line="232" selection-end-line="232" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/ENG_MainThread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="334" selection-start-line="334" selection-end-line="334" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/menusystemsimpleview/SimpleViewGameMenuManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="630" selection-start-line="630" selection-end-line="630" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/registeredclasses/ServerConnectionRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/registeredclasses/NetBase.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-110">
+          <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/levelresource/Level.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/levelresource/MultiplayerClientLevelStart.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/levelresource/MultiplayerClientLevel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="237" column="15" selection-start-line="237" selection-start-column="15" selection-end-line="237" selection-end-column="15" />
+        </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="119">
+          <caret line="7" column="51" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
+        </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="283">
+          <caret line="94" column="48" selection-start-line="94" selection-start-column="48" selection-end-line="94" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="1441" column="16" selection-start-line="1441" selection-start-column="16" selection-end-line="1441" selection-end-column="16" />
+          <folding>
+            <element signature="e#8693#8694#0" expanded="true" />
+            <element signature="e#8730#8731#0" expanded="true" />
+            <element signature="e#8803#8804#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8897#8898#0" expanded="true" />
+            <element signature="e#8933#8934#0" expanded="true" />
+            <element signature="e#8993#8994#0" expanded="true" />
+            <element signature="e#9042#9043#0" expanded="true" />
+            <element signature="e#13672#13673#0" expanded="true" />
+            <element signature="e#13726#13727#0" expanded="true" />
+            <element signature="e#23736#23737#0" expanded="true" />
+            <element signature="e#23791#23792#0" expanded="true" />
+            <element signature="e#25008#25009#0" expanded="true" />
+            <element signature="e#25044#25045#0" expanded="true" />
+            <element signature="e#37141#37142#0" expanded="true" />
+            <element signature="e#37193#37194#0" expanded="true" />
           </folding>
         </state>
       </provider>

diff -r 2c53eb3d74a1 -r 86f56edd56f1 raw/hotshot_gamedata/level_multiplayer_map0.txt
--- a/raw/hotshot_gamedata/level_multiplayer_map0.txt	Thu Jan 17 22:20:32 2019 +0200
+++ b/raw/hotshot_gamedata/level_multiplayer_map0.txt	Tue Jan 29 22:20:19 2019 +0200
@@ -35,7 +35,7 @@
 				position 0.0 0.0 350.0
 				orientation 0.0 1.0 0.0 0.0
 			}
-		/*	spawn_point 1
+			spawn_point 1
 			{
 				type human
 				position -100.0 -200.0 350.0
@@ -52,7 +52,7 @@
 				type alien
 				position -100.0 200.0 350.0
 				orientation 0.0 1.0 0.0 0.0
-			}*/
+			}
 		}
 		obj CargoShip0
 		{