From d48cc76313d74f02a0e8b4a072e6aa8a4625971f Mon Sep 17 00:00:00 2001
From: irnsght <irnsght@gmail.com>
Date: Fri, 2 Apr 2021 21:44:04 +0200
Subject: [PATCH] Fixed warpJumpManager trying to access a private variable in
 jumpevent (was set to private in recent starloader update probably)

---
 .idea/workspace.xml                           |  64 +++++++++++-------
 .run/SM with warpspace.run.xml                |   4 +-
 out/production/Warpspace/testing/main.class   | Bin 2927 -> 371 bytes
 src/me/iron/WarpSpace/Mod/WarpJumpEvent.java  |   2 +-
 .../iron/WarpSpace/Mod/WarpJumpManager.java   |   4 +-
 5 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 199c92f..ddedda1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ArtifactsWorkspaceSettings">
     <artifacts-to-build>
-      <artifact name="WarpSpace_v0_9_1" />
+      <artifact name="WarpSpace" />
+      <artifact name="WarpSpaceDedicated" />
     </artifacts-to-build>
   </component>
   <component name="BranchesTreeState">
@@ -31,11 +32,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a50c0474-8c4f-4b3c-af8e-c6949eadf1eb" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/WarpSpace.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.run/SM with warpspace.run.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.run/SM with warpspace.run.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/Warpspace/testing/main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Warpspace/testing/main.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/me/iron/WarpSpace/Mod/WarpJumpEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/me/iron/WarpSpace/Mod/WarpJumpEvent.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/me/iron/WarpSpace/Mod/WarpJumpManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/me/iron/WarpSpace/Mod/WarpJumpManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mod.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/mod.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -231,9 +232,10 @@
     <option name="LAST_COMMIT_MESSAGE" value="Deleted and rebuilt javadoc bc it didnt deploye correctly on github." />
   </component>
   <component name="WindowStateProjectService">
-    <state x="2143" y="99" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1616192339674">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state x="279" y="84" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1617392168830">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state x="279" y="84" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1617392168830" />
     <state x="2143" y="99" key="#com.intellij.execution.impl.EditConfigurationsDialog/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616192339674" />
     <state x="2532" y="213" key="#com.intellij.ide.util.MemberChooser" timestamp="1616179404112">
       <screen x="1920" y="32" width="1536" height="832" />
@@ -261,53 +263,62 @@
       <screen x="1920" y="32" width="1536" height="832" />
     </state>
     <state x="2058" y="32" key="CommitChangelistDialog2/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616251200364" />
-    <state x="740" y="274" key="FileChooserDialogImpl" timestamp="1609333079561">
+    <state x="740" y="274" key="FileChooserDialogImpl" timestamp="1617392154504">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.32.1536.824@0.0.1920.1040" timestamp="1609333079561" />
+    <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1617392154504" />
     <state x="2411" y="345" key="Git.Rebase.Log.Action.NewCommitMessage.Dialog" timestamp="1616192263483">
       <screen x="1920" y="32" width="1536" height="832" />
     </state>
     <state x="2411" y="345" key="Git.Rebase.Log.Action.NewCommitMessage.Dialog/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616192263483" />
-    <state width="1493" height="278" key="GridCell.Tab.0.bottom" timestamp="1616450614137">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.0.bottom" timestamp="1617392172287">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.32.1536.824@0.0.1920.1040" timestamp="1609362576028" />
+    <state width="1877" height="348" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172287" />
     <state width="1877" height="282" key="GridCell.Tab.0.bottom/1920.32.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1616336934544" />
     <state width="1493" height="278" key="GridCell.Tab.0.bottom/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450614137" />
-    <state width="1493" height="278" key="GridCell.Tab.0.center" timestamp="1616450614137">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.0.center" timestamp="1617392172287">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="282" key="GridCell.Tab.0.center/0.0.1920.1040/1920.32.1536.824@0.0.1920.1040" timestamp="1609362576028" />
+    <state width="1877" height="348" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172287" />
     <state width="1877" height="282" key="GridCell.Tab.0.center/1920.32.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1616336934544" />
     <state width="1493" height="278" key="GridCell.Tab.0.center/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450614137" />
-    <state width="1493" height="278" key="GridCell.Tab.0.left" timestamp="1616450614137">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.0.left" timestamp="1617392172286">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="282" key="GridCell.Tab.0.left/0.0.1920.1040/1920.32.1536.824@0.0.1920.1040" timestamp="1609362576028" />
+    <state width="1877" height="348" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172286" />
     <state width="1877" height="282" key="GridCell.Tab.0.left/1920.32.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1616336934544" />
     <state width="1493" height="278" key="GridCell.Tab.0.left/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450614137" />
-    <state width="1493" height="278" key="GridCell.Tab.0.right" timestamp="1616450614137">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.0.right" timestamp="1617392172287">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="282" key="GridCell.Tab.0.right/0.0.1920.1040/1920.32.1536.824@0.0.1920.1040" timestamp="1609362576028" />
+    <state width="1877" height="348" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172287" />
     <state width="1877" height="282" key="GridCell.Tab.0.right/1920.32.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1616336934544" />
     <state width="1493" height="278" key="GridCell.Tab.0.right/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450614137" />
-    <state width="1493" height="278" key="GridCell.Tab.1.bottom" timestamp="1616450613887">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.1.bottom" timestamp="1617392172129">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state width="1877" height="348" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172129" />
     <state width="1493" height="278" key="GridCell.Tab.1.bottom/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450613887" />
-    <state width="1493" height="278" key="GridCell.Tab.1.center" timestamp="1616450613887">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.1.center" timestamp="1617392172128">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state width="1877" height="348" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172128" />
     <state width="1493" height="278" key="GridCell.Tab.1.center/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450613887" />
-    <state width="1493" height="278" key="GridCell.Tab.1.left" timestamp="1616450613887">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.1.left" timestamp="1617392172128">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state width="1877" height="348" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172128" />
     <state width="1493" height="278" key="GridCell.Tab.1.left/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450613887" />
-    <state width="1493" height="278" key="GridCell.Tab.1.right" timestamp="1616450613887">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state width="1877" height="348" key="GridCell.Tab.1.right" timestamp="1617392172128">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state width="1877" height="348" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617392172128" />
     <state width="1493" height="278" key="GridCell.Tab.1.right/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450613887" />
     <state x="1920" y="32" key="MergeDialog" timestamp="1616192715479">
       <screen x="1920" y="32" width="1536" height="832" />
@@ -321,10 +332,11 @@
       <screen x="1920" y="32" width="1536" height="832" />
     </state>
     <state x="2458" y="147" key="RollbackChangesDialog/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616192118418" />
-    <state x="2272" y="32" key="SettingsEditor" timestamp="1616450841963">
-      <screen x="1920" y="32" width="1536" height="832" />
+    <state x="440" y="0" key="SettingsEditor" timestamp="1617392156841">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="440" y="94" key="SettingsEditor/0.0.1920.1040/1920.32.1536.824@0.0.1920.1040" timestamp="1609333096659" />
+    <state x="440" y="0" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1617392156841" />
     <state x="2272" y="32" key="SettingsEditor/1920.32.1536.832/0.0.1920.1040@1920.32.1536.832" timestamp="1616450841963" />
     <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1616333331774">
       <screen x="0" y="0" width="1920" height="1040" />
@@ -336,5 +348,9 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="777" y="434" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/1920.32.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1609433828577" />
+    <state x="515" y="256" width="889" height="629" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1617391783248">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="515" y="256" width="889" height="629" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.1920.1040@0.0.1920.1040" timestamp="1617391783248" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.run/SM with warpspace.run.xml b/.run/SM with warpspace.run.xml
index e9e1694..5e5e43a 100644
--- a/.run/SM with warpspace.run.xml	
+++ b/.run/SM with warpspace.run.xml	
@@ -7,9 +7,7 @@
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="1.7" />
     <method v="2">
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="WarpSpace" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/out/production/Warpspace/testing/main.class b/out/production/Warpspace/testing/main.class
index 93cd031dd2ee0be7091308afd27f2f8e9c8eafdb..26e89ed31aa88085b5415c8faf9f1b56bff5a8a2 100644
GIT binary patch
delta 205
zcmaDa_L)ia)W2Q(7#J9g8AP}km>C4w8HCswgeO-rPLbgX&Mz%WPIb%7No8c<%uUS9
z)5}UMOXOi-VPKtnfJLdEL6Lz8s0Rd?7#KmqK#~o}(+ARwK$=x+I|JiJurxc6WCIKG
vF>nCcJP-v8oD5t*9w!4gSOlb58;C)gF*FJyX=G&JW#HultK<igObh}5=d%?5

literal 2927
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

diff --git a/src/me/iron/WarpSpace/Mod/WarpJumpEvent.java b/src/me/iron/WarpSpace/Mod/WarpJumpEvent.java
index 41a4a74..7745d2a 100644
--- a/src/me/iron/WarpSpace/Mod/WarpJumpEvent.java
+++ b/src/me/iron/WarpSpace/Mod/WarpJumpEvent.java
@@ -86,7 +86,7 @@ public void cancel(String pilotMessage) {
         //TODO add message and cancel event
         //display string to pilots
         ship.sendControllingPlayersServerMessage(Lng.astr(pilotMessage),ServerMessage.MESSAGE_TYPE_WARNING);
-        this.canceled = true;
+        this.setCanceled(true);
     }
 
     public String toString() {
diff --git a/src/me/iron/WarpSpace/Mod/WarpJumpManager.java b/src/me/iron/WarpSpace/Mod/WarpJumpManager.java
index b574590..e2c67d1 100644
--- a/src/me/iron/WarpSpace/Mod/WarpJumpManager.java
+++ b/src/me/iron/WarpSpace/Mod/WarpJumpManager.java
@@ -107,7 +107,7 @@ public void run() {
                 }
 
 
-                if (e.canceled) {
+                if (e.isCanceled()) {
                     cancel();
                     return;
                 }
@@ -165,7 +165,7 @@ public void run() {
                 //for all attached players send travel update, bc drop is over
                 SendPlayerWarpSituation(ship, WarpProcessController.WarpProcess.JUMPENTRY,0, new ArrayList<String>());
 
-                if (e.canceled) {
+                if (e.isCanceled()) {
                     cancel();
                     return;
                 }