Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2025-12-23 17:09:18 +00:00
Code Issues Releases 1 Activity

Merge pull request #164 from Auxilor/develop

Browse Source 
Fixed %gained_xp% placeholder returning per-skill, not per-player values
This commit is contained in:
Will FP
2025-01-31 11:45:07 +00:00
committed by GitHub
parent 12cb85f023 88f9113349
commit 56ef17f451
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt
View File

@@ -37,13 +37,22 @@ fun Player.toggleXPGainSound() {
this.profile.write(xpGainSoundEnabledKey, !this.profile.read(xpGainSoundEnabledKey)) this.profile.write(xpGainSoundEnabledKey, !this.profile.read(xpGainSoundEnabledKey))
} }
data class PlayerSkill(
val player: UUID,
val skill: String
)
private fun playerSkill(player: Player, skill: Skill): PlayerSkill {
return PlayerSkill(player.uniqueId, skill.id)
}
val Player.isXPGainSoundEnabled: Boolean val Player.isXPGainSoundEnabled: Boolean
get() = this.profile.read(xpGainSoundEnabledKey) get() = this.profile.read(xpGainSoundEnabledKey)
class GainXPDisplay( class GainXPDisplay(
private val plugin: EcoPlugin private val plugin: EcoPlugin
) : Listener { ) : Listener {
private val gainCache: Cache<Pair<UUID, String>, Double> = Caffeine.newBuilder().expireAfterWrite(Duration.ofSeconds(3)) private val gainCache: Cache<PlayerSkill, Double> = Caffeine.newBuilder().expireAfterWrite(Duration.ofSeconds(3))
.build() .build()
private val sound = if (plugin.configYml.getBool("skills.gain-xp.sound.enabled")) { private val sound = if (plugin.configYml.getBool("skills.gain-xp.sound.enabled")) {
@@ -55,8 +64,8 @@ class GainXPDisplay(
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
fun handle(event: PlayerSkillXPGainEvent) { fun handle(event: PlayerSkillXPGainEvent) {
val player = event.player val player = event.player
val current = gainCache.get(player.uniqueId to event.skill.id) { 0.0 } val current = gainCache.get(playerSkill(player, event.skill)) { 0.0 }
gainCache.put(player.uniqueId to event.skill.id, current + event.gainedXP) gainCache.put(playerSkill(player, event.skill), current + event.gainedXP)
// Run next tick because level up calls before xp is added // Run next tick because level up calls before xp is added
plugin.scheduler.run { plugin.scheduler.run {
@@ -112,7 +121,7 @@ class GainXPDisplay(
) )
.replace("%current_xp%", event.player.getSkillXP(event.skill).toNiceString()) .replace("%current_xp%", event.player.getSkillXP(event.skill).toNiceString())
.replace("%required_xp%", event.player.getFormattedRequiredXP(event.skill)) .replace("%required_xp%", event.player.getFormattedRequiredXP(event.skill))
.replace("%gained_xp%", gainCache.get(event.player.uniqueId to event.skill.id) { 0.0 }.toNiceString()) .replace("%gained_xp%", gainCache.get(playerSkill(event.player, event.skill)) { 0.0 }.toNiceString())
.formatEco( .formatEco(
placeholderContext( placeholderContext(
event.player, event.player,