Commit: e94bba547e5439e3662f8b7ee5d83391b260c0e0 - HotshotServer (hg)

Commit MetaInfo

• Révision: e94bba547e5439e3662f8b7ee5d83391b260c0e0 (tree)
• l'heure: 2018-10-19 05:25:05
• Auteur: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Message de Log

Increased end level end time for testing.

Change Summary

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

Modification

diff -r ea7494bb107f -r e94bba547e54 .idea/workspace.xml
--- a/.idea/workspace.xml	Wed Oct 17 00:21:29 2018 +0300
+++ b/.idea/workspace.xml	Thu Oct 18 23:25:05 2018 +0300
@@ -2,13 +2,8 @@
 <project version="4">
   <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$/raw/dejavu.gorilla" beforeDir="false" afterPath="$PROJECT_DIR$/raw/dejavu.gorilla" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/raw/nine_patch_test.gorilla" beforeDir="false" afterPath="$PROJECT_DIR$/raw/nine_patch_test.gorilla" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/raw/panel_programs.txt" beforeDir="false" afterPath="$PROJECT_DIR$/raw/panel_programs.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/raw/sh_panel_fs.txt" beforeDir="false" afterPath="$PROJECT_DIR$/raw/sh_panel_fs.txt" 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,12 +64,14 @@
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="14" />
+          <entry key="CLASS" value="4" />
+          <entry key="JAVA" value="17" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="java" value="14" />
+          <entry key="class" value="4" />
+          <entry key="java" value="17" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -93,41 +90,19 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.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="178">
-              <caret line="138" selection-start-line="138" selection-end-line="138" />
-              <folding>
-                <element signature="e#5805#5806#0" expanded="true" />
-                <element signature="e#5872#5873#0" expanded="true" />
-              </folding>
+              <caret line="91" selection-start-line="91" selection-end-line="91" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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="286">
-              <caret line="98" selection-start-line="98" selection-end-line="98" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="167">
-              <caret line="136" selection-start-line="136" selection-end-line="136" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="167">
-              <caret line="1433" selection-start-line="1433" selection-end-line="1433" />
+            <state relative-caret-position="178">
+              <caret line="1411" selection-start-line="1411" selection-end-line="1411" />
               <folding>
                 <element signature="e#8610#8611#0" expanded="true" />
                 <element signature="e#8647#8648#0" expanded="true" />
@@ -143,6 +118,67 @@
                 <element signature="e#23708#23709#0" expanded="true" />
                 <element signature="e#24925#24926#0" expanded="true" />
                 <element signature="e#24961#24962#0" expanded="true" />
+                <element signature="e#48077#48078#0" expanded="true" />
+                <element signature="e#48129#48130#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/TcpConnection.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="206" selection-start-line="206" selection-end-line="206" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Server.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="436" selection-start-line="436" selection-end-line="436" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryo/Kryo.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="370" selection-start-line="370" selection-end-line="370" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Connection.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="55" selection-start-line="55" selection-end-line="55" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="383">
+              <caret line="365" selection-start-line="365" selection-end-line="365" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="371">
+              <caret line="178" selection-start-line="178" selection-end-line="178" />
+              <folding>
+                <element signature="e#6350#6351#0" expanded="true" />
+                <element signature="e#6546#6547#0" expanded="true" />
+                <element signature="e#6602#6603#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -158,55 +194,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="371">
-              <caret line="186" selection-start-line="186" selection-end-line="186" />
-              <folding>
-                <element signature="e#6312#6313#0" expanded="true" />
-                <element signature="e#6350#6351#0" expanded="true" />
-                <element signature="e#6602#6603#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/com/artemis/systems/IntervalEntityProcessingSystem.java">
+        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/UserStatsUpdaterSystem.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="349">
-              <caret line="46" selection-start-line="46" selection-end-line="46" />
-              <folding>
-                <element signature="e#954#955#0" expanded="true" />
-                <element signature="e#991#992#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="167">
-              <caret line="190" selection-start-line="190" selection-end-line="190" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/com/artemis/BaseSystem.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="178">
-              <caret line="45" selection-start-line="45" selection-end-line="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/components/EntityProperties.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14127">
-              <caret line="1064" column="13" selection-start-line="1064" selection-start-column="13" selection-end-line="1064" selection-end-column="13" />
+            <state relative-caret-position="119">
+              <caret line="29" selection-start-line="29" selection-end-line="29" />
             </state>
           </provider>
         </entry>
@@ -216,6 +207,7 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>Missing ser</find>
+      <find>Created entity:</find>
     </findStrings>
   </component>
   <component name="GradleLocalSettings">
@@ -919,15 +911,16 @@
       <workItem from="1539375163137" duration="3143000" />
       <workItem from="1539514815394" duration="74000" />
       <workItem from="1539514967406" duration="9626000" />
-      <workItem from="1539717897560" duration="3557000" />
+      <workItem from="1539717897560" duration="22477000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="107754000" />
+    <option name="totallyTimeSpent" value="126674000" />
   </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" />
@@ -939,7 +932,7 @@
       <window_info content_ui="combo" id="Project" order="7" sideWeight="0.4940171" visible="true" weight="0.19722815" />
       <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.32929516" />
+      <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="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -1002,13 +995,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java</url>
-          <line>1433</line>
+          <line>1445</line>
           <properties />
           <option name="timeStamp" value="33" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java</url>
-          <line>1268</line>
+          <line>1280</line>
           <properties />
           <option name="timeStamp" value="34" />
         </line-breakpoint>
@@ -1054,36 +1047,6 @@
           <properties />
           <option name="timeStamp" value="50" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java</url>
-          <line>113</line>
-          <properties />
-          <option name="timeStamp" value="56" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/ENG_RenderRoot.java</url>
-          <line>138</line>
-          <properties />
-          <option name="timeStamp" value="59" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java</url>
-          <line>136</line>
-          <properties />
-          <option name="timeStamp" value="61" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java</url>
-          <line>91</line>
-          <properties />
-          <option name="timeStamp" value="62" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java</url>
-          <line>1399</line>
-          <properties />
-          <option name="timeStamp" value="64" />
-        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
@@ -1095,41 +1058,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/animations/PortalEnteringWithoutRenderingAnimation.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="67" selection-start-line="67" selection-end-line="67" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/CollisionDetectionSystem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="333" column="66" selection-start-line="333" selection-start-column="66" selection-end-line="333" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/LevelEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerSP.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="595" column="60" selection-start-line="595" selection-start-column="60" selection-end-line="595" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/systems/EntityRemoverSystem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="58" selection-start-line="58" selection-end-line="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/EntityRemoverServerSideSystem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1400,13 +1328,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="113" selection-start-line="113" selection-end-line="113" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/com/artemis/BaseSystem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="178">
@@ -1425,13 +1346,6 @@
         </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="167">
-          <caret line="190" selection-start-line="190" selection-end-line="190" />
-        </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="178">
@@ -1445,27 +1359,15 @@
     </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="167">
-          <caret line="136" selection-start-line="136" selection-end-line="136" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/NetManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="371">
-          <caret line="186" selection-start-line="186" selection-end-line="186" />
-          <folding>
-            <element signature="e#6312#6313#0" expanded="true" />
-            <element signature="e#6350#6351#0" expanded="true" />
-            <element signature="e#6602#6603#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="178">
+          <caret line="91" selection-start-line="91" selection-end-line="91" />
         </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="167">
-          <caret line="1433" selection-start-line="1433" selection-end-line="1433" />
+        <state relative-caret-position="178">
+          <caret line="1411" selection-start-line="1411" selection-end-line="1411" />
           <folding>
             <element signature="e#8610#8611#0" expanded="true" />
             <element signature="e#8647#8648#0" expanded="true" />
@@ -1481,6 +1383,69 @@
             <element signature="e#23708#23709#0" expanded="true" />
             <element signature="e#24925#24926#0" expanded="true" />
             <element signature="e#24961#24962#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/kryonet.jar!/com/esotericsoftware/kryonet/TcpConnection.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="206" selection-start-line="206" selection-end-line="206" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Server.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="436" selection-start-line="436" selection-end-line="436" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryo/Kryo.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="370" selection-start-line="370" selection-end-line="370" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/kryonet.jar!/com/esotericsoftware/kryonet/Connection.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="55" selection-start-line="55" selection-end-line="55" />
+        </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="383">
+          <caret line="365" selection-start-line="365" selection-end-line="365" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/MainActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="113" selection-start-line="113" selection-end-line="113" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/multiplayer/systems/UserStatsUpdaterSystem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <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/net/NetManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="371">
+          <caret line="178" selection-start-line="178" selection-end-line="178" />
+          <folding>
+            <element signature="e#6350#6351#0" expanded="true" />
+            <element signature="e#6546#6547#0" expanded="true" />
+            <element signature="e#6602#6603#0" expanded="true" />
           </folding>
         </state>
       </provider>

diff -r ea7494bb107f -r e94bba547e54 raw/hotshot_gamedata/level_multiplayer_map0.txt
--- a/raw/hotshot_gamedata/level_multiplayer_map0.txt	Wed Oct 17 00:21:29 2018 +0300
+++ b/raw/hotshot_gamedata/level_multiplayer_map0.txt	Thu Oct 18 23:25:05 2018 +0300
@@ -221,7 +221,7 @@
 				cond loss_cond1
 				{
 					type time_elapsed
-					secs 600
+					secs 60000
 				}
 				comparator ( or loss_cond0 loss_cond1 )
 			}