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

fix fallback entity name

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-07 21:56:58 +01:00
parent fddea73f3a
commit c809357f16
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ abstract class LivingEntity(connection: PlayConnection, entityType: EntityType,
override val canRaycast: Boolean get() = super.canRaycast && health > 0.0
override val name: ChatComponent? get() = super.name ?: connection.language.translate(type.translationKey)
override val name: ChatComponent? get() = super.name
private fun getLivingEntityFlag(bitMask: Int): Boolean {
return data.getBitMask(FLAGS_DATA, bitMask, 0x00)

6
src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeature.kt
View File

@ -52,7 +52,11 @@ class EntityNameFeature(renderer: EntityRenderer<*>) : BillboardTextFeature(rend
private fun Entity.getName(invisible: Boolean): ChatComponent? {
if (invisible) return null
if (this.isNameVisible) return name
if (this.isNameVisible) {
var name = this.name
if (name == null && this is LivingEntity) name = connection.language.translate(type.translationKey) // TODO: Is that correct?
return name
}
if (!isTargeted()) return null
return name
}