AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 01:16:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix pipeline

Browse Source
This commit is contained in:
Bixilon 2021-06-01 20:28:31 +02:00 committed by Lukas
parent c39a608f59
commit 587d8de7af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt
View File

@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities
import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityMetaDataFields
import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.entities.attributes.DefaultEntityAttributes import de.bixilon.minosoft.data.mappings.effects.attributes.DefaultStatusEffectAttributeNames
import de.bixilon.minosoft.data.mappings.entities.EntityType import de.bixilon.minosoft.data.mappings.entities.EntityType
import de.bixilon.minosoft.data.player.Hands import de.bixilon.minosoft.data.player.Hands
import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.ChatColors
@ -53,7 +53,7 @@ abstract class LivingEntity(connection: PlayConnection, entityType: EntityType,
get() { get() {
val meta = entityMetaData.sets.getFloat(EntityMetaDataFields.LIVING_ENTITY_HEALTH) val meta = entityMetaData.sets.getFloat(EntityMetaDataFields.LIVING_ENTITY_HEALTH)
return if (meta == Float.MIN_VALUE) { return if (meta == Float.MIN_VALUE) {
entityType.attributes[DefaultEntityAttributes.GENERIC_MAX_HEALTH] ?: 1.0f entityType.attributes[DefaultStatusEffectAttributeNames.GENERIC_MAX_HEALTH] ?: 1.0f
} else { } else {
meta meta
} }