diff options
author | Maxim <maxim235@gmx.de> | 2023-03-04 14:56:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-04 14:56:54 +0100 |
commit | 3baa08c9f4363303fd8ad35e3f7a210d9bffb11a (patch) | |
tree | 00c474b6bb333d7d73b27bd46edb1510d583a09f /src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java | |
parent | 0c32f2b4a5c0a2a11fd8f2a0044fd28ebabc2b19 (diff) | |
download | GT5-Unofficial-3baa08c9f4363303fd8ad35e3f7a210d9bffb11a.tar.gz GT5-Unofficial-3baa08c9f4363303fd8ad35e3f7a210d9bffb11a.tar.bz2 GT5-Unofficial-3baa08c9f4363303fd8ad35e3f7a210d9bffb11a.zip |
Fix space project upgrades not working (#1783)
* Fix upgrade requirements being always wrong/causing NPE
* Fix unlock command only unlocking unstarted projects
* Fixed upgrades never finishing
* Fixed upgrades not loading
* Delete upgrade being build if finished
* Fix built upgrades not being loaded
* Address review
* Addressed new reviews
Diffstat (limited to 'src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java')
-rw-r--r-- | src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java index 6dc80db3ec..d24ead8f88 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java @@ -43,7 +43,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade; /** * This class is used so that I can write and read to a json file before the world is opened. On server starting is too * late for this as the data stored in the files is needed before entities load their nbt data - * + * * @author BlueWeabo */ public class SpaceProjectWorldSavedData extends WorldSavedData { @@ -185,15 +185,16 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { String projectName = obj.get(PROJECT_NAME).getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); int projectCurrentStage = obj.get(PROJECT_CURRENT_STAGE).getAsInt(); - ISP_Upgrade[] projectUpgradesBuilt = context - .deserialize(obj.get(PROJECT_UPGRADES_BUILT), ISP_Upgrade.class); + ISP_Upgrade[] projectUpgradesBuilt = new ISP_Upgrade[0]; + projectUpgradesBuilt = context + .deserialize(obj.get(PROJECT_UPGRADES_BUILT), projectUpgradesBuilt.getClass()); ISP_Upgrade projectCurrentUpgrade = context .deserialize(obj.get(PROJECT_CURRENT_UPGRADE), ISP_Upgrade.class); ISpaceBody projectLocation = SpaceProjectManager.getLocation(obj.get(PROJECT_LOCATION).getAsString()); project.setBuiltUpgrade(projectUpgradesBuilt); - project.setCurrentUpgradeBeingBuilt(projectCurrentUpgrade); project.setProjectLocation(projectLocation); project.setProjectCurrentStage(projectCurrentStage); + project.setCurrentUpgradeBeingBuilt(projectCurrentUpgrade); return project; } } |