Merge pull request #17 from portlek/withoutplayer

Remove Player from XItemStack & XEntity equipment
CryptoMorin · Feb 6, 2020 · b937cf1 · b937cf1
2 parents 4c6becf + 4206eba
commit b937cf1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ pom.xml
 .idea/
 target/
 repo/
+out/
+META-INF/
diff --git a/src/main/java/com/cryptomorin/xseries/XEntity.java b/src/main/java/com/cryptomorin/xseries/XEntity.java
@@ -103,37 +103,37 @@ public static Entity spawn(Location location, ConfigurationSection config) {
 
                 ConfigurationSection helment = equip.getConfigurationSection("helment");
                 if (helment != null) {
-                    equipment.setHelmet(XItemStack.deserialize(null, helment.getConfigurationSection("item")));
+                    equipment.setHelmet(XItemStack.deserialize(helment.getConfigurationSection("item")));
                     equipment.setHelmetDropChance(helment.getInt("drop-chance"));
                 }
 
                 ConfigurationSection chestplate = equip.getConfigurationSection("chestplate");
                 if (chestplate != null) {
-                    equipment.setChestplate(XItemStack.deserialize(null, chestplate.getConfigurationSection("item")));
+                    equipment.setChestplate(XItemStack.deserialize(chestplate.getConfigurationSection("item")));
                     equipment.setChestplateDropChance(chestplate.getInt("drop-chance"));
                 }
 
                 ConfigurationSection leggings = equip.getConfigurationSection("leggings");
                 if (leggings != null) {
-                    equipment.setLeggings(XItemStack.deserialize(null, leggings.getConfigurationSection("item")));
+                    equipment.setLeggings(XItemStack.deserialize(leggings.getConfigurationSection("item")));
                     equipment.setLeggingsDropChance(leggings.getInt("drop-chance"));
                 }
 
                 ConfigurationSection boots = equip.getConfigurationSection("boots");
                 if (boots != null) {
-                    equipment.setBoots(XItemStack.deserialize(null, boots.getConfigurationSection("item")));
+                    equipment.setBoots(XItemStack.deserialize(boots.getConfigurationSection("item")));
                     equipment.setBootsDropChance(boots.getInt("drop-chance"));
                 }
 
                 ConfigurationSection mainHand = equip.getConfigurationSection("main-hand");
                 if (mainHand != null) {
-                    equipment.setItemInMainHand(XItemStack.deserialize(null, mainHand.getConfigurationSection("item")));
+                    equipment.setItemInMainHand(XItemStack.deserialize(mainHand.getConfigurationSection("item")));
                     equipment.setItemInMainHandDropChance(mainHand.getInt("drop-chance"));
                 }
 
                 ConfigurationSection offHand = equip.getConfigurationSection("off-hand");
                 if (offHand != null) {
-                    equipment.setItemInOffHand(XItemStack.deserialize(null, offHand.getConfigurationSection("item")));
+                    equipment.setItemInOffHand(XItemStack.deserialize(offHand.getConfigurationSection("item")));
                     equipment.setItemInOffHandDropChance(offHand.getInt("drop-chance"));
                 }
             }
@@ -173,7 +173,7 @@ public static Entity spawn(Location location, ConfigurationSection config) {
                         ConfigurationSection itemSec = items.getConfigurationSection(key);
                         int slot = itemSec.getInt("slot", -1);
                         if (slot != -1) {
-                            ItemStack item = XItemStack.deserialize(null, itemSec);
+                            ItemStack item = XItemStack.deserialize(itemSec);
                             if (item != null) chested.getInventory().setItem(slot, item);
                         }
                     }

diff --git a/src/main/java/com/cryptomorin/xseries/XItemStack.java b/src/main/java/com/cryptomorin/xseries/XItemStack.java
@@ -34,7 +34,6 @@
 import org.bukkit.block.banner.Pattern;
 import org.bukkit.block.banner.PatternType;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
 import org.bukkit.entity.TropicalFish;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemFlag;
@@ -156,12 +155,11 @@ public static void serialize(ItemStack item, ConfigurationSection config) {
     /**
      * Deserialize an ItemStack from the config.
      *
-     * @param player used for placeholders. You must implement your own.
      * @param config the config section to deserialize the ItemStack object from.
      * @return a deserialized ItemStack.
      */
     @SuppressWarnings("deprecation")
-    public static ItemStack deserialize(Player player, ConfigurationSection config) {
+    public static ItemStack deserialize(ConfigurationSection config) {
         // Material
         String material = config.getString("material");
         if (material == null) return null;
@@ -254,7 +252,7 @@ public static ItemStack deserialize(Player player, ConfigurationSection config)
             if (meta instanceof CrossbowMeta) {
                 CrossbowMeta crossbow = (CrossbowMeta) meta;
                 for (String projectiles : config.getConfigurationSection("projectiles").getKeys(false)) {
-                    ItemStack projectile = deserialize(player, config.getConfigurationSection("projectiles." + projectiles));
+                    ItemStack projectile = deserialize(config.getConfigurationSection("projectiles." + projectiles));
                     crossbow.addChargedProjectile(projectile);
                 }
             } else if (meta instanceof TropicalFishBucketMeta) {