Repo-Mirror/EcoPets
9
0
Fork 0
Code Issues Releases 1 Activity

Changed pet display

Browse Source
This commit is contained in:
Auxilor
2022-07-21 16:39:47 +01:00
parent a06808f802
commit 1daa52e1f4
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetDisplay.kt
View File

@@ -19,7 +19,7 @@ class PetDisplay(
) : Listener {
private var tick = 0
private val trackedEntities = mutableMapOf<UUID, ArmorStand>()
private val trackedEntities = mutableMapOf<UUID, PetArmorStand>()
fun tickAll() {
for (player in Bukkit.getOnlinePlayers()) {
@@ -72,8 +72,13 @@ class PetDisplay(
}
private fun getOrNew(player: Player): ArmorStand? {
val existing = trackedEntities[player.uniqueId]
val tracked = trackedEntities[player.uniqueId]
val existing = tracked?.stand
val pet = player.activePet
if (pet != tracked?.pet) {
tracked?.stand?.remove()
}
if (existing == null || existing.isDead || pet == null) {
existing?.remove()
@@ -86,15 +91,15 @@ class PetDisplay(
val location = getLocation(player)
val stand = pet.makePetEntity().spawn(location)
trackedEntities[player.uniqueId] = stand
trackedEntities[player.uniqueId] = PetArmorStand(stand, pet)
}
return trackedEntities[player.uniqueId]
return trackedEntities[player.uniqueId]?.stand
}
fun shutdown() {
for (stand in trackedEntities.values) {
stand.remove()
stand.stand.remove()
}
trackedEntities.clear()
@@ -102,7 +107,12 @@ class PetDisplay(
@EventHandler
fun onLeave(event: PlayerQuitEvent) {
trackedEntities[event.player.uniqueId]?.remove()
trackedEntities[event.player.uniqueId]?.stand?.remove()
trackedEntities.remove(event.player.uniqueId)
}
private data class PetArmorStand(
val stand: ArmorStand,
val pet: Pet
)
}