From 38b50fccba92ed34b9e8e24e30924fdaef49ae52 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 14 Dec 2021 10:58:30 +0000 Subject: [PATCH] Fixed warnings --- .../com/willfp/talismans/command/CommandReload.kt | 1 - .../com/willfp/talismans/command/CommandTalismans.kt | 1 - .../kotlin/com/willfp/talismans/config/TalismansYml.kt | 1 - .../kotlin/com/willfp/talismans/talismans/Talisman.kt | 10 +++++----- .../talismans/talismans/util/TalismanCraftListener.kt | 4 ++-- .../talismans/util/TalismanEnableListeners.kt | 2 ++ 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandReload.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandReload.kt index b294d7a..ea9fe7b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandReload.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandReload.kt @@ -1,7 +1,6 @@ package com.willfp.talismans.command import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.command.CommandHandler import com.willfp.eco.core.command.impl.Subcommand import org.bukkit.command.CommandSender diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandTalismans.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandTalismans.kt index 6ccc966..f541bcd 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandTalismans.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandTalismans.kt @@ -1,7 +1,6 @@ package com.willfp.talismans.command import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.command.CommandHandler import com.willfp.eco.core.command.impl.PluginCommand import org.bukkit.command.CommandSender diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/config/TalismansYml.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/config/TalismansYml.kt index db992d5..e125775 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/config/TalismansYml.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/config/TalismansYml.kt @@ -3,6 +3,5 @@ package com.willfp.talismans.config import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.config.BaseConfig import com.willfp.eco.core.config.ConfigType -import com.willfp.eco.core.config.yaml.YamlBaseConfig class TalismansYml(plugin: EcoPlugin) : BaseConfig("talismans", plugin, false, ConfigType.YAML) \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt index ce5f67b..42c0db4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt @@ -22,7 +22,7 @@ import org.bukkit.inventory.ItemStack import org.bukkit.permissions.Permission import org.bukkit.permissions.PermissionDefault import org.bukkit.persistence.PersistentDataType -import java.util.* +import java.util.Objects class Talisman( private val config: Config, @@ -98,14 +98,14 @@ class Talisman( Talismans.addNewTalisman(this) } - override fun equals(o: Any?): Boolean { - if (this === o) { + override fun equals(other: Any?): Boolean { + if (this === other) { return true } - if (o !is Talisman) { + if (other !is Talisman) { return false } - return key == o.key + return key == other.key } override fun hashCode(): Int { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanCraftListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanCraftListener.kt index d9ef997..9de6dfc 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanCraftListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanCraftListener.kt @@ -21,7 +21,7 @@ class TalismanCraftListener : Listener { val recipe = event.recipe as? ShapedRecipe ?: return val key = recipe.key.key.replace("_displayed", "") - val talisman = getByID(key) ?: return + getByID(key) ?: return if (event.viewers.isEmpty()) { return @@ -44,7 +44,7 @@ class TalismanCraftListener : Listener { val recipe = event.recipe as? ShapedRecipe ?: return val key = recipe.key.key.replace("_displayed", "") - val talisman = getByID(key) ?: return + getByID(key) ?: return if (event.viewers.isEmpty()) { return diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanEnableListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanEnableListeners.kt index 98725dc..8615efa 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanEnableListeners.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanEnableListeners.kt @@ -1,3 +1,5 @@ +@file:Suppress("UNUSED_PARAMETER") + package com.willfp.talismans.talismans.util import com.willfp.eco.core.EcoPlugin