Merge remote-tracking branch 'origin/master'

This commit is contained in:
GearShocky 2023-03-14 19:04:14 +06:00
commit 8dfc3fe88f

View File

@ -1,6 +1,7 @@
package ru.dbotthepony.mc.otm.compat.adastra package ru.dbotthepony.mc.otm.compat.adastra
import earth.terrarium.ad_astra.AdAstra import earth.terrarium.ad_astra.AdAstra
import earth.terrarium.ad_astra.common.data.Planet
import earth.terrarium.ad_astra.common.data.PlanetData import earth.terrarium.ad_astra.common.data.PlanetData
import earth.terrarium.ad_astra.common.item.armor.SpaceSuit import earth.terrarium.ad_astra.common.item.armor.SpaceSuit
import earth.terrarium.ad_astra.common.registry.ModDamageSource import earth.terrarium.ad_astra.common.registry.ModDamageSource
@ -40,7 +41,7 @@ fun onMatteryTick(event: MatteryPlayerCapability.PostTick) {
ServerCompatConfig.AdAstra.ANDROID_COSMIC_RAYS && ServerCompatConfig.AdAstra.ANDROID_COSMIC_RAYS &&
!event.player.abilities.invulnerable && !event.player.abilities.invulnerable &&
event.capability.isAndroid && event.capability.isAndroid &&
!ModUtils.planetHasAtmosphere(event.level) !PlanetData.getPlanetFromLevel(event.level.dimension()).map(Planet::hasAtmosphere).orElse(true)
) { ) {
val rand = event.level.random val rand = event.level.random