From 88f974fd10adeb7fc0a41161c4f16331aff2d77b Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 14 Sep 2022 21:08:14 +0100 Subject: [PATCH] Fixed long standing bug with ItemProvider (and scyther integration) --- eco-api/src/main/java/com/willfp/eco/core/items/Items.java | 4 ++-- .../spigot/integrations/customitems/CustomItemsScyther.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/Items.java b/eco-api/src/main/java/com/willfp/eco/core/items/Items.java index 9df54b97..2a84718f 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/Items.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/Items.java @@ -230,8 +230,8 @@ public final class Items { String reformattedKey = keyID.replace("__", ":"); - item = provider.provideForKey(reformattedKey); - if (item instanceof EmptyTestableItem || item == null) { + part = provider.provideForKey(reformattedKey); + if (part instanceof EmptyTestableItem || part == null) { return new EmptyTestableItem(); } registerCustomItem(namespacedKey, item); diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsScyther.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsScyther.kt index 01139637..960bcacc 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsScyther.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsScyther.kt @@ -27,11 +27,11 @@ class CustomItemsScyther : CustomItemsIntegration { Scyther.getInstance(), material, 0, - null, + 1.0, 1, Int.MAX_VALUE, - null, - null + "AUTOSELL", + true ) val namespacedKey = NamespacedKeyUtils.create("scyther", key)