Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ object PitScoreboard : Listener {
player.scoreboard = board.scoreboard
}

private fun formatLevel(level: Int, prestigeLevel: Int): String {
val prestigeColor = getPrestigeColor(prestigeLevel)
val chatColor = getChatColorForLevel(level)
val formattedLevel = if (level >= 60) "${ChatColor.BOLD}$level" else level.toString()

return "${ChatColor.RESET}${prestigeColor}[${chatColor}$formattedLevel${prestigeColor}]"
}

private fun formatLine(key: String, color: ChatColor?, value: String): String {
val finalColor = color?.toString() ?: ""
return ChatColor.WHITE.toString() + key + ": " + finalColor + value
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
package org.thepitcommunityserver.game.playerExperience.player

import net.md_5.bungee.api.chat.ClickEvent
import net.md_5.bungee.api.chat.ComponentBuilder
import net.md_5.bungee.api.chat.HoverEvent
import net.md_5.bungee.api.chat.TextComponent
import net.minecraft.server.v1_8_R3.ChatClickable
import net.minecraft.server.v1_8_R3.PacketPlayOutTitle
import org.bukkit.ChatColor
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import org.bukkit.event.entity.PlayerDeathEvent
import org.thepitcommunityserver.util.createChatComponent
import org.thepitcommunityserver.util.replaceChatColorTags
import org.thepitcommunityserver.util.sendPacketToPlayer
import org.thepitcommunityserver.db.data
import org.thepitcommunityserver.util.*

object PlayerDeathMessage : Listener {

@EventHandler
fun playerDeathMessage(event: PlayerDeathEvent) {
val player = event.entity ?: return
Expand All @@ -17,6 +23,11 @@ object PlayerDeathMessage : Listener {
val title = createChatComponent(titleMessage)
val titlePacket = PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TITLE, title, 0, 60, 15)

var chatMessage = TextComponent("<red:bold>DEATH!</red:bold> by ${formatLevel(player.data.level, player.data.prestige)} ${player.name} <yellow:bold>VIEW RECAP</yellow:bold>".parseChatColors())
chatMessage.clickEvent = ClickEvent(ClickEvent.Action.RUN_COMMAND, "/recap")
chatMessage.hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, ComponentBuilder("<yellow>click to view kill recap<yellow>".parseChatColors()).create())

sendPacketToPlayer(player, titlePacket)
player.spigot().sendMessage(chatMessage)
}
}
9 changes: 8 additions & 1 deletion src/main/kotlin/org/thepitcommunityserver/util/XP.kt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ fun getPrestigeColor(prestigeLevel: Int): ChatColor {
}
}


fun getPrestigeModifier(prestigeLevel: Int): Double {
val modifiers = listOf(
0.0, 10.0, 20.0, 30.0, 40.0, 50.0,
Expand All @@ -77,3 +76,11 @@ fun getPrestigeModifier(prestigeLevel: Int): Double {
val index = prestigeLevel.coerceIn(0, 30)
return modifiers[index]
}

fun formatLevel(level: Int, prestigeLevel: Int): String {
val prestigeColor = getPrestigeColor(prestigeLevel)
val chatColor = getChatColorForLevel(level)
val formattedLevel = if (level >= 60) "${ChatColor.BOLD}$level" else level.toString()

return "${ChatColor.RESET}${prestigeColor}[${chatColor}$formattedLevel${prestigeColor}]"
}