Repo-Mirror/Talismans
9
0
Fork 0
Code Issues Releases 1 Activity

Updated to 1.6.2 and fixed crafting

Browse Source
This commit is contained in:
Auxilor
2021-01-14 08:18:07 +00:00
parent 9f0ef2f577
commit 3860c32fee
4 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java
View File

@@ -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)
);
}

26
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java
View File

@@ -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);
}
}
}

22
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java
View File

@@ -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;
}

2
gradle.properties
View File

@@ -1,2 +1,2 @@
version = 1.6.1
version = 1.6.2
plugin-name = Talismans