From eb73bb3dd609c5df1dfb1917a6bb0ac66970e693 Mon Sep 17 00:00:00 2001 From: ltjessem Date: Thu, 5 May 2022 08:27:36 +0200 Subject: [PATCH 1/2] Wrong way around --- .../main/kotlin/com/willfp/ecoarmor/util/PlayableSound.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/util/PlayableSound.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/util/PlayableSound.kt index a0de21f..ff8d592 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/util/PlayableSound.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/util/PlayableSound.kt @@ -5,10 +5,10 @@ import org.bukkit.entity.Player class PlayableSound( private val sound: Sound, - private val pitch: Double, - val volume: Double + val volume: Double, + private val pitch: Double ) { fun play(player: Player) { player.playSound(player.location, sound, volume.toFloat(), pitch.toFloat()) } -} \ No newline at end of file +} From a8451415f1006b6ccb5c64886d5093d252687fdb Mon Sep 17 00:00:00 2001 From: ltjessem Date: Thu, 5 May 2022 08:29:22 +0200 Subject: [PATCH 2/2] advancedEquip and unequip not defined properly --- .../com/willfp/ecoarmor/sets/ArmorSet.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt index 73be3af..f07bd12 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt @@ -79,22 +79,22 @@ class ArmorSet( /* * Advanced equip Sound */ - val advancedEquipSound = if (config.getBool("sounds.equip.enabled")) { + val advancedEquipSound = if (config.getBool("sounds.advancedEquip.enabled")) { PlayableSound( - Sound.valueOf(config.getString("sounds.equip.sound").uppercase()), - config.getDouble("sounds.equip.volume"), - config.getDouble("sounds.equip.pitch") + Sound.valueOf(config.getString("sounds.advancedEquip.sound").uppercase()), + config.getDouble("sounds.advancedEquip.volume"), + config.getDouble("sounds.advancedEquip.pitch") ) } else null /* * Unequip Sound */ - val unequipSound = if (config.getBool("sounds.equip.enabled")) { + val unequipSound = if (config.getBool("sounds.unequip.enabled")) { PlayableSound( - Sound.valueOf(config.getString("sounds.equip.sound").uppercase()), - config.getDouble("sounds.equip.volume"), - config.getDouble("sounds.equip.pitch") + Sound.valueOf(config.getString("sounds.unequip.sound").uppercase()), + config.getDouble("sounds.unequip.volume"), + config.getDouble("sounds.unequip.pitch") ) } else null @@ -333,4 +333,4 @@ class ArmorSet( class SimpleHolder( override val conditions: Set, override val effects: Set -) : Holder \ No newline at end of file +) : Holder