feat: add vanilla item check for drop/trash protect

Author: acrylic-style

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "6.20.2+1.15.2"
+version = "6.20.3+1.15.2"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(11))

src/main/java/com/github/mori01231/lifecore/listener/DropProtectListener.java

@@ -10,8 +10,10 @@
 import net.minecraft.server.v1_15_R1.DataWatcherObject;
 import net.minecraft.server.v1_15_R1.EntityItem;
 import net.minecraft.server.v1_15_R1.Items;
+import net.minecraft.server.v1_15_R1.NBTTagCompound;
 import org.bukkit.ChatColor;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftItem;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerDropItemEvent;
@@ -47,7 +49,7 @@ public void onDrop(PlayerDropItemEvent e) {
 
         if (plugin.getDropProtectConfig().contains(e.getPlayer().getUniqueId(), "has_pve_level") && requiredLevel > 0) {
             shouldCancel = true;
-        } else if (plugin.getDropProtectConfig().contains(e.getPlayer().getUniqueId(), "has_no_pve_level") && requiredLevel == 0) {
+        } else if (plugin.getDropProtectConfig().contains(e.getPlayer().getUniqueId(), "has_no_pve_level") && requiredLevel == 0 && !isVanillaItem(itemStack)) {
             shouldCancel = true;
         } else {
             if (rarity == null) {
@@ -96,4 +98,9 @@ private void cancelDrop(PlayerDropItemEvent e, ItemStack stack, String reason) {
             e.getPlayer().sendMessage(ChatColor.AQUA + "/pickupstash" + ChatColor.RED + "で回収できます。");
         });
     }
+    
+    private boolean isVanillaItem(@NotNull ItemStack itemStack) {
+        NBTTagCompound tag = CraftItemStack.asNMSCopy(itemStack).getTag();
+        return tag == null;
+    }
 }

src/main/java/com/github/mori01231/lifecore/listener/TrashListener.kt

@@ -11,6 +11,7 @@ import org.bukkit.Bukkit
 import org.bukkit.ChatColor
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.event.inventory.InventoryDragEvent
@@ -46,7 +47,7 @@ class TrashListener(private val plugin: LifeCore) : Listener {
                     val shouldCancel =
                         if (plugin.trashProtectConfig.contains(e.whoClicked.uniqueId, "has_pve_level") && requiredLevel > 0) {
                             true
-                        } else if (plugin.trashProtectConfig.contains(e.whoClicked.uniqueId, "has_no_pve_level") && requiredLevel == 0L) {
+                        } else if (plugin.trashProtectConfig.contains(e.whoClicked.uniqueId, "has_no_pve_level") && requiredLevel == 0L && !isVanillaItem(item)) {
                             true
                         } else {
                             if (rarity == null) {
@@ -126,4 +127,9 @@ class TrashListener(private val plugin: LifeCore) : Listener {
             }
         }
     }
+    
+    private fun isVanillaItem(itemStack: ItemStack): Boolean {
+        val tag = CraftItemStack.asNMSCopy(itemStack).tag
+        return tag == null
+    }
 }