From f80e666e70ff9badaa415b5652fbf92a17ca99fc Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Mon, 21 May 2018 19:50:08 -0400 Subject: [PATCH] NPE fix perms fix --- src/main/java/com/songoda/epicfarming/farming/Farm.java | 4 ++-- .../com/songoda/epicfarming/handlers/FarmingHandler.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/songoda/epicfarming/farming/Farm.java b/src/main/java/com/songoda/epicfarming/farming/Farm.java index f500440..ef4c4fa 100644 --- a/src/main/java/com/songoda/epicfarming/farming/Farm.java +++ b/src/main/java/com/songoda/epicfarming/farming/Farm.java @@ -103,13 +103,13 @@ public class Farm { inventory.setItem(nu, Methods.getGlass()); nu++; } - if (instance.getConfig().getBoolean("Main.Upgrade With XP") && player != null && player.hasPermission("EpicDispensers.Upgrade.XP")) { + if (instance.getConfig().getBoolean("Main.Upgrade With XP") && player != null && player.hasPermission("EpicFarming.Upgrade.XP")) { inventory.setItem(11, itemXP); } inventory.setItem(13, item); - if (instance.getConfig().getBoolean("Main.Upgrade With Economy") && player != null && player.hasPermission("EpicDispensers.Upgrade.ECO")) { + if (instance.getConfig().getBoolean("Main.Upgrade With Economy") && player != null && player.hasPermission("EpicFarming.Upgrade.ECO")) { inventory.setItem(15, itemECO); } diff --git a/src/main/java/com/songoda/epicfarming/handlers/FarmingHandler.java b/src/main/java/com/songoda/epicfarming/handlers/FarmingHandler.java index 3b42e38..c6cdaf7 100644 --- a/src/main/java/com/songoda/epicfarming/handlers/FarmingHandler.java +++ b/src/main/java/com/songoda/epicfarming/handlers/FarmingHandler.java @@ -108,8 +108,12 @@ public class FarmingHandler { private boolean doDrop(Farm farm, Material material) { Random random = new Random(); - ItemStack stack = new ItemStack(CropType.getCropType(material).getYieldMaterial()); - ItemStack seedStack = new ItemStack(CropType.getCropType(material).getSeedMaterial(), random.nextInt(3) + 1); + CropType.CropTypeData cropTypeData = CropType.getCropType(material); + + if (material == null || farm == null || cropTypeData == null) return false; + + ItemStack stack = new ItemStack(cropTypeData.getYieldMaterial()); + ItemStack seedStack = new ItemStack(cropTypeData.getSeedMaterial(), random.nextInt(3) + 1); if (!canMove(farm.getInventory(), stack)) return false; farm.getInventory().addItem(stack);