diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a59bc57..ada80d41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,6 @@ ### ADDITIONS: ### FIXES: -- fixed mod not working with latest GTM -- fixed bromine process -- fixed passengers not teleporting when you fall off a space station, locking the client in unknown state +- fixed space crashing when using upgraded non-spacesuit armor -### CHANGES: -- updated ja-jp translation \ No newline at end of file +### CHANGES: \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c654041f..df6d1c86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M mod_id=gcyr mod_name=Gregicality Rocketry -mod_version=0.1.7 +mod_version=0.1.7-a maven_group=argent_matter loom.platform=forge \ No newline at end of file diff --git a/src/main/java/argent_matter/gcyr/common/entity/data/EntityTemperatureSystem.java b/src/main/java/argent_matter/gcyr/common/entity/data/EntityTemperatureSystem.java index 0f3e2c80..161e7be9 100644 --- a/src/main/java/argent_matter/gcyr/common/entity/data/EntityTemperatureSystem.java +++ b/src/main/java/argent_matter/gcyr/common/entity/data/EntityTemperatureSystem.java @@ -47,7 +47,7 @@ public static void temperatureTick(LivingEntity entity, ServerLevel level) { UniformInt temperatureResistance = TEMP_RANGE; if (SpaceSuitArmorItem.hasFullSet(entity)) { - temperatureResistance = ((SpaceSuitArmorItem) entity.getArmorSlots().iterator().next().getItem()).getTemperatureThreshold(); + temperatureResistance = SpaceSuitArmorItem.getTemperatureThreshold(); } if (temperature > temperatureResistance.getMaxValue() && !entity.fireImmune() && !entity.hasEffect(MobEffects.FIRE_RESISTANCE) && !EntityTemperatureSystem.armourIsHeatResistant(entity)) { diff --git a/src/main/java/argent_matter/gcyr/common/item/armor/SpaceSuitArmorItem.java b/src/main/java/argent_matter/gcyr/common/item/armor/SpaceSuitArmorItem.java index a8e2bb46..cd555670 100644 --- a/src/main/java/argent_matter/gcyr/common/item/armor/SpaceSuitArmorItem.java +++ b/src/main/java/argent_matter/gcyr/common/item/armor/SpaceSuitArmorItem.java @@ -128,7 +128,7 @@ public static void consumeSpaceSuitOxygen(LivingEntity entity, int amount) { } - public UniformInt getTemperatureThreshold() { + public static UniformInt getTemperatureThreshold() { return UniformInt.of(60, 363); }