Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-01-12 23:10:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed spell right click blacklist

Browse Source
This commit is contained in:
Auxilor 2021-05-22 17:13:13 +01:00
parent b111d57261
commit fbafda9f43
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java
View File

@ -15,6 +15,7 @@ import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.SoundCategory;
import org.bukkit.Tag;
import org.bukkit.block.Container;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -25,6 +26,7 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.util.NumberConversions;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@ -41,6 +43,33 @@ public abstract class Spell extends EcoEnchant {
Material.FISHING_ROD,
Material.BOW
);
/**
* Items that don't cause spells to activate when right clicked.
*/
private static final List<Material> BLACKLIST_CLICKED_BLOCKS = new ArrayList<>(Arrays.asList(
Material.CRAFTING_TABLE,
Material.GRINDSTONE,
Material.ENCHANTING_TABLE,
Material.ANVIL,
Material.FURNACE,
Material.SMITHING_TABLE,
Material.LEVER,
Material.REPEATER,
Material.COMPARATOR,
Material.RESPAWN_ANCHOR,
Material.NOTE_BLOCK,
Material.ITEM_FRAME
));
static {
BLACKLIST_CLICKED_BLOCKS.addAll(Tag.BUTTONS.getValues());
BLACKLIST_CLICKED_BLOCKS.addAll(Tag.BEDS.getValues());
BLACKLIST_CLICKED_BLOCKS.addAll(Tag.DOORS.getValues());
BLACKLIST_CLICKED_BLOCKS.addAll(Tag.FENCE_GATES.getValues());
BLACKLIST_CLICKED_BLOCKS.addAll(Tag.TRAPDOORS.getValues());
}
/**
* The cooldown end times linked to players.
*/
@ -195,12 +224,7 @@ public abstract class Spell extends EcoEnchant {
if (event.getClickedBlock() != null) {
if (event.getClickedBlock().getState() instanceof Container
|| event.getClickedBlock().getState() instanceof BlockInventoryHolder
|| event.getClickedBlock().getType() == Material.CRAFTING_TABLE
|| event.getClickedBlock().getType() == Material.GRINDSTONE
|| event.getClickedBlock().getType() == Material.ENCHANTING_TABLE
|| event.getClickedBlock().getType() == Material.ANVIL
|| event.getClickedBlock().getType() == Material.FURNACE
|| event.getClickedBlock().getType() == Material.SMITHING_TABLE) {
|| BLACKLIST_CLICKED_BLOCKS.contains(event.getClickedBlock().getType())) {
return;
}
}