Skip to content

Commit

Permalink
Fixed warpJumpManager trying to access a private variable in jumpeven…
Browse files Browse the repository at this point in the history
…t (was set to private in recent starloader update probably)
  • Loading branch information
irnsght committed Apr 2, 2021
1 parent 02adb14 commit d48cc76
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 30 deletions.
64 changes: 40 additions & 24 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .run/SM with warpspace.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Binary file modified out/production/Warpspace/testing/main.class
Binary file not shown.
2 changes: 1 addition & 1 deletion src/me/iron/WarpSpace/Mod/WarpJumpEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions src/me/iron/WarpSpace/Mod/WarpJumpManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void run() {
}


if (e.canceled) {
if (e.isCanceled()) {
cancel();
return;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit d48cc76

Please sign in to comment.