Add PlayerDeathEvent

Signed-off-by: Seppe Volkaerts <seppevolkaerts@hotmail.com>

proxy/src/main/kotlin/org/lanternpowered/terre/event/player/PlayerDeathEvent.kt

@@ -0,0 +1,20 @@
+/*
+ * Terre
+ *
+ * Copyright (c) LanternPowered <https://www.lanternpowered.org>
+ * Copyright (c) contributors
+ *
+ * This work is licensed under the terms of the MIT License (MIT). For
+ * a copy, see 'LICENSE.txt' or <https://opensource.org/licenses/MIT>.
+ */
+package org.lanternpowered.terre.event.player
+
+import org.lanternpowered.terre.Player
+import org.lanternpowered.terre.event.Event
+
+/**
+ * An event that is thrown when a player dies.
+ */
+data class PlayerDeathEvent(
+  val player: Player,
+) : Event

proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/ConnectionHandler.kt

@@ -29,6 +29,7 @@ import org.lanternpowered.terre.impl.network.packet.PlayerActivePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerChatMessagePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerCommandPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerDeathPacket
+import org.lanternpowered.terre.impl.network.packet.PlayerHealthPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerHurtPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInfoPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInventorySlotPacket
@@ -118,6 +119,10 @@ internal interface ConnectionHandler {
     return false
   }
 
+  fun handle(packet: PlayerHealthPacket): Boolean {
+    return false
+  }
+
   fun handle(packet: PlayerDeathPacket): Boolean {
     return false
   }

proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/ConnectionHandlerBindings.kt

@@ -40,6 +40,7 @@ import org.lanternpowered.terre.impl.network.packet.SpeechBubblePacket
 import org.lanternpowered.terre.impl.network.packet.StatusPacket
 import org.lanternpowered.terre.impl.network.packet.ItemUpdateOwnerPacket
 import org.lanternpowered.terre.impl.network.packet.NpcUpdatePacket
+import org.lanternpowered.terre.impl.network.packet.PlayerHealthPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInventorySlotPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerPvPPacket
 import org.lanternpowered.terre.impl.network.packet.ProjectileUpdatePacket
@@ -87,6 +88,7 @@ internal object ConnectionHandlerBindings {
     bind<PlayerUpdatePacket>(ConnectionHandler::handle)
     bind<PlayerTeamPacket>(ConnectionHandler::handle)
     bind<PlayerPvPPacket>(ConnectionHandler::handle)
+    bind<PlayerHealthPacket>(ConnectionHandler::handle)
     bind<SimpleItemUpdatePacket>(ConnectionHandler::handle)
     bind<InstancedItemUpdatePacket>(ConnectionHandler::handle)
     bind<ShimmeredItemUpdatePacket>(ConnectionHandler::handle)

proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/backend/ServerPlayConnectionHandler.kt

@@ -32,6 +32,7 @@ import org.lanternpowered.terre.impl.network.packet.ItemUpdatePacket
 import org.lanternpowered.terre.impl.network.packet.NpcUpdatePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerActivePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerChatMessagePacket
+import org.lanternpowered.terre.impl.network.packet.PlayerHealthPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInfoPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInventorySlotPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerPvPPacket
@@ -143,6 +144,13 @@ internal class ServerPlayConnectionHandler(
     return false // Forward
   }
 
+  override fun handle(packet: PlayerHealthPacket): Boolean {
+    if (packet.playerId == player.playerId) {
+      return player.handleHealth(packet, clientConnection)
+    }
+    return true // Forward
+  }
+
   override fun handle(packet: ProjectileUpdatePacket): Boolean {
     val projectile = player.trackedProjectiles[packet.id]
     projectile.active = true

proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/client/ClientPlayConnectionHandler.kt

@@ -140,7 +140,7 @@ internal class ClientPlayConnectionHandler(
     player.serverConnection?.isWorldInitialized = true
     player.position = packet.position.toFloat()
 
-    if (packet.respawnContext == PlayerSpawnPacket.Context.SpawningIntoWorld) {
+    if (packet.context == PlayerSpawnPacket.Context.SpawningIntoWorld) {
       serverConnection?.send(packet)
       val playerId = packet.playerId
       val team = player.team
@@ -183,6 +183,16 @@ internal class ClientPlayConnectionHandler(
     return true
   }
 
+  override fun handle(packet: PlayerHealthPacket): Boolean {
+    if (packet.playerId == player.playerId) {
+      val connection = player.serverConnection?.ensureConnected()
+      if (connection != null) {
+        return player.handleHealth(packet, connection)
+      }
+    }
+    return false
+  }
+
   override fun handle(packet: PlayerPvPPacket): Boolean {
     if (packet.playerId != player.playerId)
       return false // Forward

proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/packet/PlayerSpawnPacket.kt

@@ -25,7 +25,7 @@ internal data class PlayerSpawnPacket(
   val respawnTimeRemaining: Int,
   val numberOfDeathsPvE: Int,
   val numberOfDeathsPvP: Int,
-  val respawnContext: Context
+  val context: Context
 ) : Packet {
 
   enum class Context {
@@ -41,7 +41,7 @@ internal val PlayerSpawnEncoder = PacketEncoder<PlayerSpawnPacket> { buf, packet
   buf.writeIntLE(packet.respawnTimeRemaining)
   buf.writeShortLE(packet.numberOfDeathsPvE)
   buf.writeShortLE(packet.numberOfDeathsPvP)
-  buf.writeByte(packet.respawnContext.ordinal)
+  buf.writeByte(packet.context.ordinal)
 }
 
 internal val PlayerSpawnDecoder = PacketDecoder { buf ->

proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/packet/v238/PlayerSpawn238.kt

@@ -21,7 +21,7 @@ internal val PlayerSpawn238Encoder = PacketEncoder<PlayerSpawnPacket> { buf, pac
   buf.writePlayerId(packet.playerId)
   buf.writeShortVec2i(packet.position)
   buf.writeIntLE(packet.respawnTimeRemaining)
-  buf.writeByte(packet.respawnContext.ordinal)
+  buf.writeByte(packet.context.ordinal)
 }
 
 internal val PlayerSpawn238Decoder = PacketDecoder { buf ->

proxy/src/main/kotlin/org/lanternpowered/terre/impl/player/PlayerImpl.kt

@@ -26,6 +26,7 @@ import org.lanternpowered.terre.dispatcher.launchAsync
 import org.lanternpowered.terre.event.character.InitCharacterStorageEvent
 import org.lanternpowered.terre.event.connection.PlayerLoginEvent
 import org.lanternpowered.terre.event.connection.PlayerPostLoginEvent
+import org.lanternpowered.terre.event.player.PlayerDeathEvent
 import org.lanternpowered.terre.event.server.PlayerJoinServerEvent
 import org.lanternpowered.terre.event.server.PlayerLeaveServerEvent
 import org.lanternpowered.terre.impl.ProxyImpl
@@ -43,6 +44,7 @@ import org.lanternpowered.terre.impl.network.packet.NpcUpdatePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerActivePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerChatMessagePacket
 import org.lanternpowered.terre.impl.network.packet.PlayerCommandPacket
+import org.lanternpowered.terre.impl.network.packet.PlayerHealthPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInfoPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerInventorySlotPacket
 import org.lanternpowered.terre.impl.network.packet.PlayerPvPPacket
@@ -71,6 +73,7 @@ import org.lanternpowered.terre.util.AABB
 import java.net.InetSocketAddress
 import java.util.UUID
 import java.util.concurrent.CompletableFuture
+import kotlin.math.max
 
 internal class PlayerImpl(
   val clientConnection: Connection,
@@ -112,6 +115,8 @@ internal class PlayerImpl(
 
   var forwardNextOwnerUpdate = false
 
+  private var health = -1
+
   private var characterStoragePersistJob: Job? = null
   private var characterStoragePersistQueue: Channel<Int>? = null
 
@@ -202,7 +207,7 @@ internal class PlayerImpl(
   /**
    * Deferred that will be updated when the player is cleaned up.
    */
-  var cleanedUp = CompletableFuture<Unit>()
+  private var cleanedUp = CompletableFuture<Unit>()
 
   /**
    * The status text that is currently being shown, and a counter of packets
@@ -489,7 +494,7 @@ internal class PlayerImpl(
                 serverClientUniqueId = event.clientUniqueId
               }
               connection.accept()
-              Terre.logger.debug("Successfully established connection to backend server: ${server.info}")
+              Terre.logger.debug { "Successfully established connection to backend server: ${server.info}" }
             }, clientConnection.eventLoop)
         }
       }, clientConnection.eventLoop)
@@ -568,6 +573,7 @@ internal class PlayerImpl(
   }
 
   private fun resetClient() {
+    health = -1
     for (player in trackedPlayers) {
       if (player.active)
         clientConnection.send(PlayerActivePacket(player.id, false))
@@ -593,4 +599,23 @@ internal class PlayerImpl(
     }
     trackedTeleportPylons.clear()
   }
+
+  fun handleHealth(packet: PlayerHealthPacket, connection: Connection): Boolean {
+    val health = max(0, packet.current)
+    val previousHealth = this.health
+    this.health = health
+    if (previousHealth != -1 && health == 0 && previousHealth != 0) {
+      TerreEventBus.postAsyncWithFuture(PlayerDeathEvent(this))
+        .whenCompleteAsync({ _, exception ->
+          if (exception != null) {
+            Terre.logger.error("Failed to handle player death event", exception)
+          } else {
+            connection.send(packet)
+          }
+        }, connection.eventLoop)
+      return false // Do not forward
+    }
+    return true // Forward
+  }
+
 }

test/build.gradle.kts

@@ -7,5 +7,5 @@ dependencies {
   implementation(project(":terre-proxy"))
   implementation(project(":terre-portals"))
   implementation(project(":terre-characters"))
-  implementation(project(":terre-tshock-users"))
+  // implementation(project(":terre-tshock-users"))
 }

test/src/main/kotlin/org/lanternpowered/terre/test/Test.kt

@@ -15,6 +15,7 @@ import org.lanternpowered.terre.event.chat.ServerChatEvent
 import org.lanternpowered.terre.event.connection.PlayerPostLoginEvent
 import org.lanternpowered.terre.event.player.PlayerChangePvPEnabledEvent
 import org.lanternpowered.terre.event.player.PlayerChangeTeamEvent
+import org.lanternpowered.terre.event.player.PlayerDeathEvent
 import org.lanternpowered.terre.event.proxy.ProxyInitializeEvent
 import org.lanternpowered.terre.event.server.PlayerJoinServerEvent
 import org.lanternpowered.terre.logger.Logger
@@ -49,6 +50,11 @@ class Test {
       event.cancelled = true
   }
 
+  @Subscribe
+  fun onPlayerDeath(event: PlayerDeathEvent) {
+    logger.info { "${event.player.name} died!" }
+  }
+
   /*
   @Subscribe
   fun onPlayerJoinServer(event: PlayerJoinServerEvent) {