From fb79222c98d452f9382c4909b76a3316bab64c0a Mon Sep 17 00:00:00 2001
From: Ajneb97 <ajneb97@gmail.com>
Date: Wed, 29 May 2024 08:54:41 -0400
Subject: [PATCH] 1.11.3

---
 src/main/java/pk/ajneb97/managers/KitsManager.java | 10 +++++++---
 src/main/java/pk/ajneb97/utils/PlayerUtils.java    | 10 +++++++++-
 src/main/resources/plugin.yml                      |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/pk/ajneb97/managers/KitsManager.java b/src/main/java/pk/ajneb97/managers/KitsManager.java
index c1ab2c2..65f3d9b 100644
--- a/src/main/java/pk/ajneb97/managers/KitsManager.java
+++ b/src/main/java/pk/ajneb97/managers/KitsManager.java
@@ -49,7 +49,7 @@ public class KitsManager {
 
     public Kit getKitByName(String name){
         for(Kit kit : kits){
-            if(kit.getName().equals(name)){
+            if(kit.getName().equalsIgnoreCase(name)){
                 return kit;
             }
         }
@@ -226,7 +226,7 @@ public class KitsManager {
         ArrayList<KitItem> items = kit.getItems();
 
         //Check amount of free slots, including auto-armor
-        int usedSlots = PlayerUtils.getUsedSlots(player);
+        int usedSlots = PlayerUtils.getUsedSlots(player); //storage contents, 36 slots
         int freeSlots = 36-usedSlots;
         int inventoryKitItems = 0; //Items that will be put in the player inventory (not equipment)
 
@@ -245,18 +245,22 @@ public class KitsManager {
                 if((id.contains("_HELMET") || id.contains("PLAYER_HEAD") || id.contains("SKULL_ITEM")) && itemHelmet == null && (playerInventory.getHelmet() == null
                     || playerInventory.getHelmet().getType().equals(Material.AIR))){
                     itemHelmet = item;
+                    freeSlots++;
                     continue;
                 }else if((id.contains("_CHESTPLATE") || id.contains("ELYTRA")) && itemChestplate == null && (playerInventory.getChestplate() == null
                         || playerInventory.getChestplate().getType().equals(Material.AIR))){
                     itemChestplate = item;
+                    freeSlots++;
                     continue;
                 }else if(id.contains("_LEGGINGS") && itemLeggings == null && (playerInventory.getLeggings() == null
                         || playerInventory.getLeggings().getType().equals(Material.AIR))){
                     itemLeggings = item;
+                    freeSlots++;
                     continue;
                 }else if(id.contains("_BOOTS") && itemBoots == null && (playerInventory.getBoots() == null
                         || playerInventory.getBoots().getType().equals(Material.AIR))){
                     itemBoots = item;
+                    freeSlots++;
                     continue;
                 }
             }
@@ -264,6 +268,7 @@ public class KitsManager {
             if(item.isOffhand() && itemOffhand == null && (playerInventory.getItemInOffHand() == null
                 || playerInventory.getItemInOffHand().getType().equals(Material.AIR))){
                 itemOffhand = item;
+                freeSlots++;
                 continue;
             }
 
@@ -276,7 +281,6 @@ public class KitsManager {
             }
         }
 
-
         boolean enoughSpace = freeSlots < inventoryKitItems;
         boolean dropItemsIfFullInventory = configFile.getBoolean("drop_items_if_full_inventory");
 
diff --git a/src/main/java/pk/ajneb97/utils/PlayerUtils.java b/src/main/java/pk/ajneb97/utils/PlayerUtils.java
index f167a1f..549fb78 100644
--- a/src/main/java/pk/ajneb97/utils/PlayerUtils.java
+++ b/src/main/java/pk/ajneb97/utils/PlayerUtils.java
@@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 public class PlayerUtils {
 
@@ -33,7 +34,14 @@ public class PlayerUtils {
     }
 
     public static int getUsedSlots(Player player){
-        ItemStack[] contents = getAllInventoryContents(player);
+        //ItemStack[] contents = getAllInventoryContents(player);
+        ItemStack[] contents = null;
+        if(Bukkit.getVersion().contains("1.8")) {
+            contents = player.getInventory().getContents();
+        }else{
+            contents = player.getInventory().getStorageContents();
+        }
+
         int usedSlots = 0;
         for(int i=0;i<contents.length;i++) {
             if(contents[i] != null && !contents[i].getType().equals(Material.AIR)) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 9b036c8..2514aba 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: pk.ajneb97.PlayerKits2
-version: 1.11.2
+version: 1.11.3
 name: PlayerKits2
 api-version: 1.13
 softdepend: [Vault,PlaceholderAPI]