From 0519e1dead0f0342aa7a17b745de27d0816af8a2 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Thu, 2 Feb 2023 22:59:06 +0100 Subject: [PATCH] tab list: only decorate player name, not custom display name --- .../entities/player/additional/PlayerAdditional.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/additional/PlayerAdditional.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/additional/PlayerAdditional.kt index 2c00292b1..3e885d50a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/additional/PlayerAdditional.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/additional/PlayerAdditional.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -41,7 +41,7 @@ class PlayerAdditional( var listed by observed(listed) val tabDisplayName: ChatComponent - get() = displayName?.let { team?.decorateName(it) ?: it } ?: ChatComponent.of(name) + get() = displayName ?: ChatComponent.of(name).let { team?.decorateName(it) ?: it } fun merge(data: AdditionalDataUpdate) { spareMerge(data) @@ -55,11 +55,7 @@ class PlayerAdditional( data.ping?.let { ping = it } data.hasDisplayName?.let { - displayName = if (it) { - data.displayName!! - } else { - ChatComponent.of(name) - } + displayName = if (it) data.displayName!! else null } if (data.removeFromTeam) {