From 9df3564d123d9c10fd0217c8f0dbf0cb2d674567 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Tue, 12 May 2020 16:17:51 -0400
Subject: [PATCH] Drop the correct level farm items.

---
 src/main/java/com/songoda/epicfarming/EpicFarming.java | 10 ++++------
 .../songoda/epicfarming/listeners/BlockListeners.java  |  8 ++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/songoda/epicfarming/EpicFarming.java b/src/main/java/com/songoda/epicfarming/EpicFarming.java
index c08bc86..af01db2 100644
--- a/src/main/java/com/songoda/epicfarming/EpicFarming.java
+++ b/src/main/java/com/songoda/epicfarming/EpicFarming.java
@@ -11,6 +11,7 @@ import com.songoda.core.hooks.EntityStackerManager;
 import com.songoda.core.nms.NmsManager;
 import com.songoda.core.nms.nbt.NBTCore;
 import com.songoda.core.nms.nbt.NBTItem;
+import com.songoda.core.utils.TextUtils;
 import com.songoda.epicfarming.boost.BoostData;
 import com.songoda.epicfarming.boost.BoostManager;
 import com.songoda.epicfarming.commands.*;
@@ -45,10 +46,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.PluginManager;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Created by songoda on 1/23/2018.
@@ -297,9 +295,9 @@ public class EpicFarming extends SongodaPlugin {
     public ItemStack makeFarmItem(Level level) {
         ItemStack item = Settings.FARM_BLOCK_MATERIAL.getMaterial().getItem();
         ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(Methods.formatText(Methods.formatName(level.getLevel())));
+        meta.setDisplayName(TextUtils.formatText(Methods.formatName(level.getLevel())));
         String line = getLocale().getMessage("general.nametag.lore").getMessage();
-        if (!line.equals("")) meta.setLore(Arrays.asList(line));
+        if (!line.equals("")) meta.setLore(Collections.singletonList(line));
         item.setItemMeta(meta);
 
         NBTItem nbtItem = NmsManager.getNbt().of(item);
diff --git a/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java b/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java
index 665a2ab..3f4efcf 100644
--- a/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java
+++ b/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java
@@ -88,15 +88,11 @@ public class BlockListeners implements Listener {
                 instance.getLocale().getMessage("event.warning.noauto").sendPrefixedMessage(e.getPlayer());
             }
         }
+        int level = instance.getLevelFromItem(e.getItemInHand());
         Bukkit.getScheduler().runTaskLater(instance, () -> {
-            int level = 1;
-            if (instance.getLevelFromItem(e.getItemInHand()) != 0) {
-                level = instance.getLevelFromItem(e.getItemInHand());
-            }
-
             if (location.getBlock().getType() != farmBlock) return;
 
-            Farm farm = new Farm(location, instance.getLevelManager().getLevel(level), e.getPlayer().getUniqueId());
+            Farm farm = new Farm(location, instance.getLevelManager().getLevel(level == 0 ? 1 : 0), e.getPlayer().getUniqueId());
             instance.getFarmManager().addFarm(location, farm);
 
             farm.tillLand();