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

Merge pull request #160 from Kapitowa/master

Browse Source 
Fix 2 issues
This commit is contained in:
Will FP
2025-01-31 11:43:43 +00:00
committed by GitHub
parent 287a92a23e 792965fc18
commit c47decf925
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt
View File

@@ -35,9 +35,9 @@ class CommandTop(plugin: EcoPlugin) :
return@runAsync return@runAsync
} }
val offset = (page - 1) * 10 val start = (page - 1) * 10 + 1
val end = start + 9
val positions = ((offset + page)..(offset + page + 9)).toList() val positions = (start..end).toList()
val top = if (skill == null) { val top = if (skill == null) {
positions.mapNotNull { Skills.getTop(it) } positions.mapNotNull { Skills.getTop(it) }

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

@@ -18,13 +18,14 @@ import com.willfp.ecoskills.api.getFormattedRequiredXP
import com.willfp.ecoskills.api.getSkillLevel import com.willfp.ecoskills.api.getSkillLevel
import com.willfp.ecoskills.api.getSkillProgress import com.willfp.ecoskills.api.getSkillProgress
import com.willfp.ecoskills.api.getSkillXP import com.willfp.ecoskills.api.getSkillXP
import com.willfp.ecoskills.skills.Skill
import org.bukkit.boss.BarColor import org.bukkit.boss.BarColor
import org.bukkit.boss.BarStyle import org.bukkit.boss.BarStyle
import org.bukkit.entity.Player import org.bukkit.entity.Player
import org.bukkit.event.EventHandler import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority
import org.bukkit.event.Listener import org.bukkit.event.Listener
import java.time.Duration import java.time.Duration
import java.util.UUID
private val xpGainSoundEnabledKey = PersistentDataKey( private val xpGainSoundEnabledKey = PersistentDataKey(
namespacedKeyOf("ecoskills", "gain_sound_enabled"), namespacedKeyOf("ecoskills", "gain_sound_enabled"),
@@ -42,7 +43,7 @@ val Player.isXPGainSoundEnabled: Boolean
class GainXPDisplay( class GainXPDisplay(
private val plugin: EcoPlugin private val plugin: EcoPlugin
) : Listener { ) : Listener {
private val gainCache: Cache<Skill, Double> = Caffeine.newBuilder().expireAfterWrite(Duration.ofSeconds(3)) private val gainCache: Cache<Pair<UUID, String>, 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")) {
@@ -51,11 +52,11 @@ class GainXPDisplay(
) )
} else null } else null
@EventHandler @EventHandler(priority = EventPriority.MONITOR)
fun handle(event: PlayerSkillXPGainEvent) { fun handle(event: PlayerSkillXPGainEvent) {
val player = event.player val player = event.player
val current = gainCache.get(event.skill) { 0.0 } val current = gainCache.get(player.uniqueId to event.skill.id) { 0.0 }
gainCache.put(event.skill, current + event.gainedXP) gainCache.put(player.uniqueId to event.skill.id, 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 {
@@ -111,7 +112,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.skill) { 0.0 }.toNiceString()) .replace("%gained_xp%", gainCache.get(event.player.uniqueId to event.skill.id) { 0.0 }.toNiceString())
.formatEco( .formatEco(
placeholderContext( placeholderContext(
event.player, event.player,