Minor fixes/changes

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
index 2cb89fb2d95d996eb2e8460cbf24e8a6791e14cc..aea1f951df9e45cc80dca4a603838d53a21d1dab 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
@@ -60,6 +60,12 @@ public class ClientProxy extends CommonProxy
         battleGui.turnEnd();
     }
 
+    @Override
+    public void battleStarted()
+    {
+        setBattleGuiAsGui();
+    }
+
     @Override
     public void battleEnded()
     {
@@ -68,6 +74,7 @@ public class ClientProxy extends CommonProxy
             Minecraft.getMinecraft().displayGuiScreen(null);
             Minecraft.getMinecraft().setIngameFocus();
         });
+        stopMusic();
     }
 
     @Override

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
index 2bf1b542df12e45bf6e1c182c8c764e0f73227ed..2d58ac0e341244667c93ca3eaabab3bf4ef33ec5 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
@@ -17,6 +17,8 @@ public class CommonProxy
     
     public void battleGuiTurnEnd() {}
     
+    public void battleStarted() {}
+    
     public void battleEnded() {}
     
     public void postInit() {}

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 a88b7b4b04af26f4b6ffcffee20cb92d450110e1..3bb7ca2cc080ec507b210b78be0177ab5fef9d31 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
@@ -232,7 +232,7 @@ public class PacketBattleMessage implements IMessage
                 {
                     TurnBasedMinecraftMod.currentBattle = new Battle(message.amount, null, null, false);
                 }
-                TurnBasedMinecraftMod.commonProxy.setBattleGuiAsGui();
+                TurnBasedMinecraftMod.commonProxy.battleStarted();
                 if(message.custom.isEmpty())
                 {
                     TurnBasedMinecraftMod.commonProxy.typeEnteredBattle(null);
@@ -258,7 +258,6 @@ public class PacketBattleMessage implements IMessage
             case ENDED:
                 TurnBasedMinecraftMod.commonProxy.displayString("Battle has ended!");
                 TurnBasedMinecraftMod.commonProxy.battleEnded();
-                TurnBasedMinecraftMod.commonProxy.stopMusic();
                 break;
             case ATTACK:
                 TurnBasedMinecraftMod.commonProxy.displayString(from + " attacked " + to + " and dealt " + message.amount + " damage!");