2 Commits
4.1 ... master

2 changed files with 2 additions and 2 deletions

2
.idea/misc.xml generated
View File

@@ -9,7 +9,7 @@
<component name="ProjectKey">
<option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SvnBranchConfigurationManager">

View File

@@ -239,7 +239,7 @@ public class ShipWarfareGUI extends Player {
if (exitValue == 1) {
wipe();
calculateLoot = logic.calculateLoot();
super.setMoney(logic.getMoney());
setMoney(calculateLoot+ getPlayer().getMoney());
report.setText(String.format("Our firm has earned $%,d in loot! ", calculateLoot));
continueButton.setVisible(true);
completeWipe();