diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java index 35d2f20..21b6598 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java @@ -20,7 +20,6 @@ import com.willfp.talismans.integrations.mcmmo.McmmoManager; import com.willfp.talismans.integrations.mcmmo.plugins.McmmoIntegrationImpl; import com.willfp.talismans.talismans.Talismans; import com.willfp.talismans.talismans.util.BlockPlaceListener; -import com.willfp.talismans.talismans.util.DiscoverRecipeListener; import com.willfp.talismans.talismans.util.TalismanChecks; import com.willfp.talismans.talismans.util.TalismanCraftListener; import com.willfp.talismans.talismans.util.WatcherTriggers; @@ -157,8 +156,7 @@ public class TalismansPlugin extends AbstractEcoPlugin { new WatcherTriggers(this), new BlockPlaceListener(), new TalismanCraftListener(), - new TalismanEquipEventListeners(this), - new DiscoverRecipeListener() + new TalismanEquipEventListeners(this) ); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java deleted file mode 100644 index f2307b6..0000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.willfp.talismans.talismans.util; - -import com.willfp.eco.util.config.Configs; -import com.willfp.talismans.talismans.Talisman; -import com.willfp.talismans.talismans.Talismans; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.jetbrains.annotations.NotNull; - -public class DiscoverRecipeListener implements Listener { - /** - * Unlock all recipes on player join. - * - * @param event The event to listen for. - */ - @EventHandler - public void onJoin(@NotNull final PlayerJoinEvent event) { - Player player = event.getPlayer(); - - if (Configs.CONFIG.getBool("crafting.discover")) { - Talismans.values().stream().filter(Talisman::isEnabled).map(Talisman::getKey).forEach(player::discoverRecipe); - } - } -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java index 498525b..e7d5a63 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java @@ -125,7 +125,16 @@ public class TalismanCraftListener implements Listener { } } - if (empty) { + boolean needsHeads = false; + for (ItemStack itemStack : recipe.getIngredientMap().values()) { + if (itemStack.getType() == Material.PLAYER_HEAD) { + needsHeads = true; + break; + } + } + + if (empty && needsHeads) { + event.getInventory().setResult(new ItemStack(Material.AIR)); return; } @@ -188,7 +197,16 @@ public class TalismanCraftListener implements Listener { } } - if (empty) { + boolean needsHeads = false; + for (ItemStack itemStack : recipe.getIngredientMap().values()) { + if (itemStack.getType() == Material.PLAYER_HEAD) { + needsHeads = true; + break; + } + } + + if (empty && needsHeads) { + event.getInventory().setResult(new ItemStack(Material.AIR)); return; } diff --git a/gradle.properties b/gradle.properties index fb64a76..c9dac62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 1.6.1 +version = 1.6.2 plugin-name = Talismans \ No newline at end of file