From 847e23bf0f8f7e40d0c2056f9162e0fde63be46c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 22 Sep 2019 00:41:06 -0600 Subject: [PATCH] Added wheat to the crop upgrade --- .../java/com/songoda/skyblock/listeners/Block.java | 13 +++++++------ .../java/com/songoda/skyblock/listeners/Entity.java | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/songoda/skyblock/listeners/Block.java b/src/main/java/com/songoda/skyblock/listeners/Block.java index 74ef049b..25890931 100644 --- a/src/main/java/com/songoda/skyblock/listeners/Block.java +++ b/src/main/java/com/songoda/skyblock/listeners/Block.java @@ -587,8 +587,7 @@ public class Block implements Listener { List upgrades = skyblock.getUpgradeManager().getUpgrades(Upgrade.Type.Crop); - if (upgrades != null && upgrades.size() > 0 && upgrades.get(0).isEnabled() - && island.isUpgrade(Upgrade.Type.Crop)) { + if (upgrades != null && upgrades.size() > 0 && upgrades.get(0).isEnabled() && island.isUpgrade(Upgrade.Type.Crop)) { if (NMSUtil.getVersionNumber() > 12) { try { Object blockData = block.getClass().getMethod("getBlockData").invoke(block); @@ -605,11 +604,13 @@ public class Block implements Listener { e.printStackTrace(); } } else { + Material type = block.getType(); if (block.getState().getData() instanceof Crops - || block.getType().name().equals("BEETROOT_BLOCK") - || block.getType().name().equals("CARROT") - || block.getType().name().equals("POTATO") - || block.getType().name().equals("CROPS")) { + || type.name().equals("BEETROOT_BLOCK") + || type.name().equals("CARROT") + || type.name().equals("POTATO") + || type.name().equals("WHEAT") + || type.name().equals("CROPS")) { try { block.getClass().getMethod("setData", byte.class).invoke(block, (byte) (block.getData() + 1)); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException diff --git a/src/main/java/com/songoda/skyblock/listeners/Entity.java b/src/main/java/com/songoda/skyblock/listeners/Entity.java index 54963724..535cd2c3 100644 --- a/src/main/java/com/songoda/skyblock/listeners/Entity.java +++ b/src/main/java/com/songoda/skyblock/listeners/Entity.java @@ -686,6 +686,7 @@ public class Entity implements Listener { } } + @SuppressWarnings("deprecation") @EventHandler public void onCreatureSpawn(CreatureSpawnEvent event) { if (event.getEntity() instanceof ArmorStand