Fix duplicate "... entered battle" messages

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index e2a7ef750cb6eb785c8b4624b5863aae00e6fac3..abb191002ccf91946e6ac8a6fabcebc27feaeaab 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
@@ -191,34 +191,37 @@ public class Battle
             }
         }
         
-        for(Combatant c : this.sideA.values())
-        {
-            if(c.entityInfo != null)
-            {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, c.entityInfo.category);
-            }
-            else if(c.entity instanceof EntityPlayer)
-            {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, "player");
-            }
-            else
-            {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id);
-            }
-        }
-        for(Combatant c : this.sideB.values())
+        if(isServer)
         {
-            if(c.entityInfo != null)
+            for(Combatant c : this.sideA.values())
             {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, c.entityInfo.category);
-            }
-            else if(c.entity instanceof EntityPlayer)
-            {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, "player");
+                if(c.entityInfo != null)
+                {
+                    sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, c.entityInfo.category);
+                }
+                else if(c.entity instanceof EntityPlayer)
+                {
+                    sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, "player");
+                }
+                else
+                {
+                    sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id);
+                }
             }
-            else
+            for(Combatant c : this.sideB.values())
             {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id);
+                if(c.entityInfo != null)
+                {
+                    sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, c.entityInfo.category);
+                }
+                else if(c.entity instanceof EntityPlayer)
+                {
+                    sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, "player");
+                }
+                else
+                {
+                    sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id);
+                }
             }
         }
         
@@ -299,17 +302,20 @@ public class Battle
             newCombatant.yaw = e.rotationYaw;
             newCombatant.pitch = e.rotationPitch;
         }
-        if(newCombatant.entityInfo != null)
-        {
-            sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, newCombatant.entityInfo.category);
-        }
-        else if(newCombatant.entity instanceof EntityPlayer)
-        {
-            sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, "player");
-        }
-        else
+        if(isServer)
         {
-            sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id);
+            if(newCombatant.entityInfo != null)
+            {
+                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, newCombatant.entityInfo.category);
+            }
+            else if(newCombatant.entity instanceof EntityPlayer)
+            {
+                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, "player");
+            }
+            else
+            {
+                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id);
+            }
         }
         notifyPlayersBattleInfo();
     }
@@ -352,17 +358,20 @@ public class Battle
             newCombatant.yaw = e.rotationYaw;
             newCombatant.pitch = e.rotationPitch;
         }
-        if(newCombatant.entityInfo != null)
-        {
-            sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, newCombatant.entityInfo.category);
-        }
-        else if(newCombatant.entity instanceof EntityPlayer)
-        {
-            sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, "player");
-        }
-        else
+        if(isServer)
         {
-            sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id);
+            if(newCombatant.entityInfo != null)
+            {
+                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, newCombatant.entityInfo.category);
+            }
+            else if(newCombatant.entity instanceof EntityPlayer)
+            {
+                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id, "player");
+            }
+            else
+            {
+                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, newCombatant.entity.getEntityId(), 0, id);
+            }
         }
         notifyPlayersBattleInfo();
     }