Fixed warpJumpManager trying to access a private variable in jumpeven…

…t (was set to private in recent starloader update probably)
IR0NSIGHT · Apr 2, 2021 · d48cc76 · d48cc76
1 parent 02adb14
commit d48cc76
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 30 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git 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>
diff --git a/out/production/Warpspace/testing/main.class b/out/production/Warpspace/testing/main.class
diff --git 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
@@ -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;
                 }