Illegal block check should be illegal item check

To fix some bypass
Winds-Studio · Oct 27, 2024 · b8b9642 · b8b9642
1 parent a88a834
commit b8b9642
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/cn/dreeam/surf/modules/antiillegal/IllegalBlockCheck.java b/src/main/java/cn/dreeam/surf/modules/antiillegal/IllegalBlockCheck.java
@@ -3,7 +3,6 @@
 import cn.dreeam.surf.config.Config;
 import cn.dreeam.surf.util.ItemUtil;
 import cn.dreeam.surf.util.MessageUtil;
-import cn.dreeam.surf.util.Util;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -16,7 +15,7 @@ public class IllegalBlockCheck implements Listener {
     public void onBlockPlace(BlockPlaceEvent event) {
         if (!Config.antiIllegalCheckIllegalBlockEnabled) return;
 
-        if (ItemUtil.isIllegalBlock(event.getItemInHand())) {
+        if (ItemUtil.isIllegalItem(event.getItemInHand())) {
             Player player = event.getPlayer();
 
             event.setCancelled(true);

diff --git a/src/main/java/cn/dreeam/surf/util/ItemUtil.java b/src/main/java/cn/dreeam/surf/util/ItemUtil.java
@@ -69,8 +69,8 @@ public static boolean isIllegalTotem(ItemStack i) {
         return i.getType().equals(XMaterial.TOTEM_OF_UNDYING.parseMaterial()) && i.getAmount() > i.getMaxStackSize();
     }
 
-    public static boolean isIllegalBlock(ItemStack i) {
-        return i.getType().isBlock() && Config.antiIllegalIllegalBlockList.contains(i.getType().toString());
+    public static boolean isIllegalItem(ItemStack i) {
+        return Config.antiIllegalIllegalBlockList.contains(i.getType().toString());
     }
 
     public static boolean isEnchantedBlock(ItemStack i) {
@@ -168,7 +168,7 @@ public static boolean hasIllegalTag(ItemStack i) {
     }
 
     public static boolean isIllegal(ItemStack i) {
-        return isIllegalBlock(i) || isEnchantedBlock(i) || isIllegalPotion(i) || hasIllegalDurability(i)
+        return isIllegalItem(i) || isEnchantedBlock(i) || isIllegalPotion(i) || hasIllegalDurability(i)
                 || isUnbreakable(i) || hasIllegalEnchants(i) || hasIllegalItemFlag(i) || hasIllegalAttributes(i);
     }
 
@@ -197,7 +197,7 @@ public static void cleanIllegals(Inventory inventory) {
 
     private static ItemStack cleanIllegals(ItemStack i) {
         if (i == null || isAir(i)) return ItemStack.empty();
-        if (isIllegalBlock(i) || isIllegalPotion(i)) return ItemStack.empty();
+        if (isIllegalItem(i) || isIllegalPotion(i)) return ItemStack.empty();
 
         if (Config.antiIllegalDeleteIllegalsWhenFoundEnabled && isIllegal(i)) {
             return ItemStack.empty();