AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 03:44:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename TabMessageSender

Browse Source
This commit is contained in:
Bixilon 2022-10-20 12:08:49 +02:00
parent ff6afd3863
commit ab7edb125f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/data/chat/ChatUtil.kt
View File

@ -26,7 +26,7 @@ object ChatUtil {
val entity = this.world.entities[uuid] val entity = this.world.entities[uuid]
if (entity == null) { if (entity == null) {
val tab = tabList.tabListItemsByUUID[uuid] ?: return UnknownMessageSender(uuid) val tab = tabList.tabListItemsByUUID[uuid] ?: return UnknownMessageSender(uuid)
return TabMessageSender(uuid, tab) return UnspawnedMessageSender(uuid, tab)
} }
if (entity !is PlayerEntity) { if (entity !is PlayerEntity) {
return InvalidSender(uuid) return InvalidSender(uuid)

5
src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerEntityMessageSender.kt
View File

@ -14,10 +14,13 @@
package de.bixilon.minosoft.data.chat.sender package de.bixilon.minosoft.data.chat.sender
import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity
import de.bixilon.minosoft.protocol.PlayerPublicKey
import java.util.* import java.util.*
class PlayerEntityMessageSender( class PlayerEntityMessageSender(
uuid: UUID, uuid: UUID,
name: String, name: String,
val player: PlayerEntity, val player: PlayerEntity,
) : PlayerMessageSender(uuid, name) ) : PlayerMessageSender(uuid, name) {
override val publicKey: PlayerPublicKey? get() = player.tabListItem.publicKey
}

5
src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerMessageSender.kt
View File

@ -13,9 +13,12 @@
package de.bixilon.minosoft.data.chat.sender package de.bixilon.minosoft.data.chat.sender
import de.bixilon.minosoft.protocol.PlayerPublicKey
import java.util.* import java.util.*
abstract class PlayerMessageSender( abstract class PlayerMessageSender(
override val uuid: UUID, override val uuid: UUID,
val name: String, val name: String,
) : MessageSender ) : MessageSender {
abstract val publicKey: PlayerPublicKey?
}

8
src/main/java/de/bixilon/minosoft/data/chat/sender/TabMessageSender.kt → src/main/java/de/bixilon/minosoft/data/chat/sender/UnspawnedMessageSender.kt
View File

@ -14,10 +14,12 @@
package de.bixilon.minosoft.data.chat.sender package de.bixilon.minosoft.data.chat.sender
import de.bixilon.minosoft.data.entities.entities.player.tab.TabListItem import de.bixilon.minosoft.data.entities.entities.player.tab.TabListItem
import de.bixilon.minosoft.protocol.PlayerPublicKey
import java.util.* import java.util.*
@Deprecated("Bad name") class UnspawnedMessageSender(
class TabMessageSender(
uuid: UUID, uuid: UUID,
val tab: TabListItem, val tab: TabListItem,
) : PlayerMessageSender(uuid, tab.name) ) : PlayerMessageSender(uuid, tab.name) {
override val publicKey: PlayerPublicKey? get() = tab.publicKey
}