Skip to content

Prevent tick overflow, improve ArmorStand scaling compatibility, and enhance sound playback robustness #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CesarSanchezGomez wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Prevent tick overflow, improve ArmorStand scaling compatibility, and enhance sound playback robustness #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88fdaf4
fix: reset tick counter to prevent overflow
CesarSanchezGomez Aug 10, 2025
e99948f
fix(compat): handle missing SCALE attribute on ArmorStand
CesarSanchezGomez Aug 10, 2025
0655183
fix(gui): handle invalid sound config for pet icon click
CesarSanchezGomez Aug 10, 2025
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
5 changes: 4 additions & 1 deletion eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetDisplay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.willfp.ecopets.pets
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.util.NumberUtils
import com.willfp.eco.util.formatEco
import com.willfp.libreforge.getDoubleFromExpression
import org.bukkit.Bukkit
import org.bukkit.Location
import org.bukkit.entity.ArmorStand
Expand All @@ -30,6 +29,10 @@ class PetDisplay(
}

tick++
// Reset tick to prevent overflow
if (tick > 1_048_576) {
tick = 0
}
}

private val smoothYOffsetMap = mutableMapOf<UUID, Double>()
Expand Down
14 changes: 8 additions & 6 deletions eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetsGUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,14 @@ object PetsGUI {
player.activePet = pet
}

player.playSound(
player.location,
Sound.valueOf(plugin.configYml.getString("gui.pet-icon.click.sound").uppercase()),
1f,
plugin.configYml.getDouble("gui.pet-icon.click.pitch").toFloat()
)
try {
val soundName = plugin.configYml.getString("gui.pet-icon.click.sound").uppercase()
val soundMethod = Sound::class.java.getMethod("valueOf", String::class.java)
val sound = soundMethod.invoke(null, soundName) as Sound
player.playSound(player.location, sound, 1f, plugin.configYml.getDouble("gui.pet-icon.click.pitch").toFloat())
} catch (e: Exception) {
plugin.logger.warning("Failed to play sound for pet icon click: ${e.message}")
}
}
})
}
Expand Down
18 changes: 12 additions & 6 deletions eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/entity/PetEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,20 @@ private fun ArmorStand.applyScale(plugin: EcoPlugin, isSkull: Boolean) {
return
}

val scaleAttribute = getAttribute(Attribute.SCALE)
if (scaleAttribute == null) {
plugin.logger.warning("Failed to set scale - SCALE attribute not found on ArmorStand")
return
val scaleAttribute = try {
Attribute::class.java.getField("SCALE").get(null) as? Attribute
} catch (_: NoSuchFieldException) {
null
}

scaleAttribute.baseValue = scale

if (scaleAttribute != null) {
val attr = getAttribute(scaleAttribute)
if (attr != null) {
attr.baseValue = scale
} else {
plugin.logger.warning("Failed to set scale - SCALE attribute not found on ArmorStand instance")
}
}
}

internal fun emptyArmorStandAt(location: Location, pet: Pet, isSkull: Boolean): ArmorStand {
Expand Down
2 changes: 1 addition & 1 deletion eco-core/core-plugin/src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ pet-entity:
bobbing-intensity: 1 # How much the pet should bob up and down (Default: 0.15)
rotation: true # If the pet should rotate/spin
rotation-intensity: 20 # How fast the pet should rotate/spin (Default: 20)
scale: 1 # Scale of the pet head entity only. (Default: 1, Min: 0.0625, Max: 16)
scale: 1 # Scale of the pet head entity only. (Default: 1, Min: 0.0625, Max: 16) (Only available for 1.21.3+)

level-up:
message:
Expand Down