From 3d6354e80866f82dcb358087a4d006ebddeb1fed Mon Sep 17 00:00:00 2001
From: Stephen Seo <seo.disparate@gmail.com>
Date: Tue, 11 Sep 2018 16:39:46 +0900
Subject: [PATCH] WIP - minor fixes

---
 .../TurnBasedMinecraft/client/BattleGui.java  |  1 +
 .../TurnBasedMinecraft/common/Battle.java     | 12 +++++++++-
 .../networking/PacketBattleMessage.java       | 24 +++++++++++++++----
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleGui.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleGui.java
index 472d339..34e7e3a 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleGui.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleGui.java
@@ -268,6 +268,7 @@ public class BattleGui extends GuiScreen
             break;
         case DECIDE_USE_ITEM:
             setState(MenuState.USE_ITEM);
+            break;
         case CANCEL:
             setState(MenuState.MAIN_MENU);
             break;
diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index 570c9b3..f691b72 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
@@ -795,6 +795,11 @@ public class Battle
                         }
                         break;
                     case USE_ITEM:
+                        if(next.itemToUse < 0 || next.itemToUse > 8)
+                        {
+                            sendMessageToAllPlayers(PacketBattleMessage.MessageType.USED_ITEM, next.entity.getEntityId(), 0, PacketBattleMessage.UsedItemAction.USED_INVALID.getValue());
+                            break;
+                        }
                         ItemStack targetItemStack = ((EntityPlayer)next.entity).inventory.getStackInSlot(next.itemToUse);
                         Item targetItem = targetItemStack.getItem();
                         if(targetItem == null)
@@ -819,8 +824,13 @@ public class Battle
                         }
                         break;
                     case SWITCH_ITEM:
+                        if(next.itemToUse < 0 || next.itemToUse > 8)
+                        {
+                            sendMessageToAllPlayers(PacketBattleMessage.MessageType.SWITCHED_ITEM, next.entity.getEntityId(), 0, 0);
+                            break;
+                        }
                         ((EntityPlayer)next.entity).inventory.currentItem = next.itemToUse;
-                        sendMessageToAllPlayers(PacketBattleMessage.MessageType.SWITCHED_ITEM, next.entity.getEntityId(), 0, 0);
+                        sendMessageToAllPlayers(PacketBattleMessage.MessageType.SWITCHED_ITEM, next.entity.getEntityId(), 0, 1);
                         break;
                     }
                     next = turnOrderQueue.poll();
diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
index 07d7ea2..cbf8248 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
@@ -297,8 +297,16 @@ public class PacketBattleMessage implements IMessage
                             from + " tried to use nothing!"));
                     break;
                 case USED_INVALID:
-                    Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
-                            from + " tried to consume " + message.custom + " and failed!"));
+                    if(message.custom.length() > 0)
+                    {
+                        Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
+                                from + " tried to consume " + message.custom + " and failed!"));
+                    }
+                    else
+                    {
+                        Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
+                                from + " tried to consume an invalid item and failed!"));
+                    }
                     break;
                 case USED_FOOD:
                     Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
@@ -327,8 +335,16 @@ public class PacketBattleMessage implements IMessage
                 }
                 break;
             case SWITCHED_ITEM:
-                Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
-                        to + " switched to a different item!"));
+                if(message.amount != 0)
+                {
+                    Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
+                            to + " switched to a different item!"));
+                }
+                else
+                {
+                    Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
+                            to + " switched to a different item but failed because it was invalid!"));
+                }
                 break;
             }
             return null;