update v0.6 pre

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/net/uomc/mineshaft/EatCommand.java b/src/main/java/net/uomc/mineshaft/EatCommand.java
index 85a64e7..626207e 100644
--- a/src/main/java/net/uomc/mineshaft/EatCommand.java
+++ b/src/main/java/net/uomc/mineshaft/EatCommand.java
@@ -65,6 +65,7 @@ public class EatCommand extends CooldownCommand {
 
         String edible = getEdibleItems(e.getMember());
 
+
         if (edible.length() < 0) {
             bot.sendErrorMessage(e, ":x: You have no edible items!");
             return false;
@@ -92,6 +93,12 @@ public class EatCommand extends CooldownCommand {
 
     public boolean eat(MessageReceivedEvent event, MineshaftItem item) {
         Member member = event.getMember();
+
+        if (bot.getPlayerStats().isInBattle(member)) {
+            bot.sendErrorMessage(event, ":x: You can't eat until pvp is over!");
+            return false;
+        }
+
         if (!bot.hasItem(member, item)) {
             bot.sendErrorMessage(event, "You don't have any " + bot.getItem(item).getSymbol() + " to eat!");
             return false;