From 967fed3164eae97f62df8e77ae7665d219158e21 Mon Sep 17 00:00:00 2001
From: Stephen Seo <seo.disparate@gmail.com>
Date: Thu, 18 Oct 2018 13:43:26 +0900
Subject: [PATCH] Fix duplicate "... entered battle" messages

---
 .../TurnBasedMinecraft/common/Battle.java     | 97 ++++++++++---------
 1 file changed, 53 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index e2a7ef7..abb1910 100644
--- 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(isServer)
         {
-            if(c.entityInfo != null)
+            for(Combatant c : this.sideA.values())
             {
-                sendMessageToAllPlayers(PacketBattleMessage.MessageType.ENTERED, c.entity.getEntityId(), 0, id, c.entityInfo.category);
+                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 if(c.entity instanceof EntityPlayer)
+            for(Combatant c : this.sideB.values())
             {
-                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(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);
+                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)
+        if(isServer)
         {
-            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);
+            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)
+        if(isServer)
         {
-            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);
+            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();
     }