From d6d0e4d3b3db27fcdc754c66b66c9834e867cb07 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 16 Jul 2021 14:48:00 +0200 Subject: [PATCH] Fixed 2 backend issues --- eco-core/core-plugin/build.gradle | 1 + .../eco/spigot/recipes/ShapedRecipeListener.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 9c0826d6..71124f36 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -18,6 +18,7 @@ dependencies { compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT' compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd' compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.157' + compileOnly 'me.clip:placeholderapi:2.10.9' // CombatLogX V10 + NewbieHelper Expansion compileOnly 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java index 85747531..75cb7a9c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java @@ -42,7 +42,7 @@ public class ShapedRecipeListener extends PluginDependent implements return; } - if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (!EcoPlugin.getPluginNames().contains(recipe.getKey().getNamespace())) { return; } @@ -72,7 +72,7 @@ public class ShapedRecipeListener extends PluginDependent implements return; } - if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (!EcoPlugin.getPluginNames().contains(recipe.getKey().getNamespace())) { return; } @@ -106,7 +106,7 @@ public class ShapedRecipeListener extends PluginDependent implements return; } - if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (!EcoPlugin.getPluginNames().contains(recipe.getKey().getNamespace())) { return; } @@ -200,7 +200,7 @@ public class ShapedRecipeListener extends PluginDependent implements return; } - if (EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (EcoPlugin.getPluginNames().contains(recipe.getKey().getNamespace())) { return; } @@ -223,7 +223,7 @@ public class ShapedRecipeListener extends PluginDependent implements return; } - if (EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (EcoPlugin.getPluginNames().contains(recipe.getKey().getNamespace())) { return; } @@ -244,7 +244,7 @@ public class ShapedRecipeListener extends PluginDependent implements */ @EventHandler public void preventLearningDisplayedRecipes(@NotNull final PlayerRecipeDiscoverEvent event) { - if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(event.getRecipe().getNamespace())) { + if (!EcoPlugin.getPluginNames().contains(event.getRecipe().getNamespace())) { return; }