Merge pull request 'test-fix-items' (#218) from test-fix-items into master

Reviewed-by: YoyoNow <jwsteam@nidido.de>

FightSystem_10/src/de/steamwar/fightsystem/listener/PersonalKitCreator_10.java

@@ -22,9 +22,15 @@ package de.steamwar.fightsystem.listener;
 import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
+import java.util.Set;
+
 class PersonalKitCreator_10 {
 
     static boolean hasItems(ItemStack stack){
-        return CraftItemStack.asNMSCopy(stack).getTag().hasKey("Items");
+        Set<String> keys = new HashSet<>(CraftItemStack.asNMSCopy(stack).getTag().c());
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
     }
 }

FightSystem_12/src/de/steamwar/fightsystem/listener/PersonalKitCreator_12.java

@@ -22,9 +22,15 @@ package de.steamwar.fightsystem.listener;
 import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
+import java.util.Set;
+
 class PersonalKitCreator_12 {
 
     static boolean hasItems(ItemStack stack){
-        return CraftItemStack.asNMSCopy(stack).getTag().hasKey("Items");
+        Set<String> keys = new HashSet<>(CraftItemStack.asNMSCopy(stack).getTag().c());
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
     }
 }

FightSystem_14/src/de/steamwar/fightsystem/listener/PersonalKitCreator_14.java

@@ -22,7 +22,9 @@ package de.steamwar.fightsystem.listener;
 import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 class PersonalKitCreator_14 {
     private PersonalKitCreator_14(){}
@@ -32,6 +34,9 @@ class PersonalKitCreator_14 {
     }
 
     static boolean hasItems(ItemStack stack){
-        return CraftItemStack.asNMSCopy(stack).getTag().hasKey("Items");
+        Set<String> keys = new HashSet<>(CraftItemStack.asNMSCopy(stack).getTag().getKeys());
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
     }
 }

FightSystem_15/src/de/steamwar/fightsystem/listener/PersonalKitCreator_15.java

@@ -22,9 +22,15 @@ package de.steamwar.fightsystem.listener;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
+import java.util.Set;
+
 class PersonalKitCreator_15 {
 
     static boolean hasItems(ItemStack stack){
-        return CraftItemStack.asNMSCopy(stack).getTag().hasKey("Items");
+        Set<String> keys = new HashSet<>(CraftItemStack.asNMSCopy(stack).getTag().getKeys());
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
     }
 }

FightSystem_8/src/de/steamwar/fightsystem/listener/PersonalKitCreator_8.java

@@ -22,9 +22,15 @@ package de.steamwar.fightsystem.listener;
 import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
+import java.util.Set;
+
 class PersonalKitCreator_8 {
 
     static boolean hasItems(ItemStack stack){
-        return CraftItemStack.asNMSCopy(stack).getTag().hasKey("Items");
+        Set<String> keys = new HashSet<>(CraftItemStack.asNMSCopy(stack).getTag().c());
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
     }
 }

FightSystem_9/src/de/steamwar/fightsystem/listener/PersonalKitCreator_9.java

@@ -22,9 +22,15 @@ package de.steamwar.fightsystem.listener;
 import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
+import java.util.Set;
+
 class PersonalKitCreator_9 {
 
     static boolean hasItems(ItemStack stack){
-        return CraftItemStack.asNMSCopy(stack).getTag().hasKey("Items");
+        Set<String> keys = new HashSet<>(CraftItemStack.asNMSCopy(stack).getTag().c());
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
     }
 }