From 4b3ef04763c854c4c7cf40349f00b20e829c47b3 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 7 Nov 2021 21:23:38 +0000 Subject: [PATCH] More codestyle --- .../reforges/integrations/ultimateskills/EffectAddAbility.kt | 2 +- .../reforges/integrations/ultimateskills/EffectAddPerk.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt index 04b832c..de473b7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt @@ -27,7 +27,7 @@ class EffectAddAbility : Effect("add_ultimateskills_ability") { } override fun handleDisable(player: Player) { - player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING) + player.persistentDataContainer.get(this.plugin.namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING) ?.let { HyperSkills.getInstance().api.removeAbility( player.uniqueId, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt index 7f57eb9..ef85d1a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt @@ -2,7 +2,6 @@ package com.willfp.reforges.integrations.ultimateskills import com.willfp.eco.core.config.interfaces.JSONConfig import com.willfp.eco.util.NumberUtils -import com.willfp.reforges.ReforgesPlugin import com.willfp.reforges.effects.Effect import mc.ultimatecore.skills.HyperSkills import mc.ultimatecore.skills.objects.perks.Perk @@ -19,13 +18,13 @@ class EffectAddPerk : Effect("add_ultimateskills_perk") { Perk.valueOf(config.getString("perk", false)), config.getDouble("amount") ) - player.persistentDataContainer.set(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING, + player.persistentDataContainer.set(this.plugin.namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING, NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("perk", false) ) } override fun handleDisable(player: Player) { - player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING) + player.persistentDataContainer.get(this.plugin.namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING) ?.let { HyperSkills.getInstance().api.removePerk( player.uniqueId,