check null for ShopItem

NyaaCat · Apr 20, 2020 · 905ad87 · 905ad87
1 parent 55155e2
commit 905ad87
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/database/SignShop.java b/src/main/java/cat/nyaa/HamsterEcoHelper/database/SignShop.java
@@ -64,7 +64,11 @@ public List<ShopItem> loadItems(String path) {
         if (config.isConfigurationSection(path)) {
             ConfigurationSection section = config.getConfigurationSection(path);
             for (String k : section.getKeys(false)) {
-                list.add(new ShopItem(section.getConfigurationSection(k)));
+                try{
+                    list.add(new ShopItem(section.getConfigurationSection(k)));
+                }catch (Exception e){
+                    logCorruptedItem();
+                }
             }
         }
         return list;
@@ -81,21 +85,25 @@ public void saveItems(String path, List<ShopItem> list) {
             if (item.amount > 0 && item.getItemStack(1).getType() != Material.AIR) {
                 ShopItem shopItem = list.get(i);
                 if (shopItem.itemStack == null){
-                    OfflinePlayer player = getPlayer();
-                    String playerName = "";
-                    if (player == null){
-                        playerName = "null";
-                    }else {
-                        playerName = player.getName();
-                    }
-                    Bukkit.getLogger().severe("null item found saving shop for " + playerName + ", uid " + getOwner() +".");
+                    logCorruptedItem();
                     continue;
                 }
                 shopItem.save(section.createSection(String.valueOf(i)));
             }
         }
     }
 
+    private void logCorruptedItem() {
+        OfflinePlayer player = getPlayer();
+        String playerName = "";
+        if (player == null){
+            playerName = "null";
+        }else {
+            playerName = player.getName();
+        }
+        Bukkit.getLogger().severe("null item found saving shop for " + playerName + ", uid " + getOwner() +".");
+    }
+
     public void yamlToNBT() {
         if (config == null) {
             load();

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/ShopItem.java b/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/ShopItem.java
@@ -1,6 +1,7 @@
 package cat.nyaa.HamsterEcoHelper.signshop;
 
 import cat.nyaa.nyaacore.utils.ItemStackUtils;
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
 
@@ -36,6 +37,9 @@ public void save(ConfigurationSection section) {
     }
 
     public ItemStack getItemStack(int amount) {
+        if (itemStack == null){
+            return new ItemStack(Material.AIR);
+        }
         ItemStack item = itemStack.clone();
         item.setAmount(amount);
         return item;