Remove use of synchronized since not using threads

src/main/java/com/burnedkirby/TurnBasedMinecraft/common/Battle.java

@@ -269,8 +269,6 @@ public class Battle
     }
     
     public boolean hasCombatant(int entityID)
-    {
-        synchronized(sideAEntryQueue)
     {
         for(Combatant c : sideAEntryQueue)
         {
@@ -279,9 +277,6 @@ public class Battle
                 return true;
             }
         }
-        }
-        synchronized(sideBEntryQueue)
-        {
         for(Combatant c : sideBEntryQueue)
         {
             if(c.entity.getEntityId() == entityID)
@@ -289,13 +284,10 @@ public class Battle
                 return true;
             }
         }
-        }
         return sideA.containsKey(entityID) || sideB.containsKey(entityID);
     }
     
     public boolean hasCombatantInSideA(int entityID)
-    {
-        synchronized(sideAEntryQueue)
     {
         for(Combatant c : sideAEntryQueue)
         {
@@ -304,7 +296,6 @@ public class Battle
                 return true;
             }
         }
-        }
         return sideA.containsKey(entityID);
     }
     
@@ -329,12 +320,9 @@ public class Battle
         newCombatant.isSideA = true;
         newCombatant.battleID = getId();
         if(isServer)
-        {
-            synchronized(sideAEntryQueue)
         {
             sideAEntryQueue.add(newCombatant);
         }
-        }
         else
         {
             sideA.put(e.getEntityId(), newCombatant);
@@ -395,12 +383,9 @@ public class Battle
         newCombatant.isSideA = false;
         newCombatant.battleID = getId();
         if(isServer)
-        {
-            synchronized(sideBEntryQueue)
         {
             sideBEntryQueue.add(newCombatant);
         }
-        }
         else
         {
             sideB.put(e.getEntityId(), newCombatant);
@@ -542,14 +527,8 @@ public class Battle
     public int getSize()
     {
         int size = sideA.size() + sideB.size();
-        synchronized(sideAEntryQueue)
-        {
         size += sideAEntryQueue.size();
-        }
-        synchronized(sideBEntryQueue)
-        {
         size += sideBEntryQueue.size();
-        }
         return size;
     }
     
@@ -820,22 +799,16 @@ public class Battle
             return true;
         }
         boolean combatantsChanged = false;
-        synchronized(sideAEntryQueue)
-        {
         for(Combatant c = sideAEntryQueue.poll(); c != null; c = sideAEntryQueue.poll())
         {
             sideA.put(c.entity.getEntityId(), c);
             combatantsChanged = true;
         }
-        }
-        synchronized(sideBEntryQueue)
-        {
         for(Combatant c = sideBEntryQueue.poll(); c != null; c = sideBEntryQueue.poll())
         {
             sideB.put(c.entity.getEntityId(), c);
             combatantsChanged = true;
         }
-        }
         if(TurnBasedMinecraftMod.proxy.getConfig().isFreezeCombatantsEnabled())
         {
             enforceFreezePositions();
@@ -967,10 +940,7 @@ public class Battle
                                     // have player look at attack target
                                     ((ServerPlayerEntity)nextEntity).connection.setPlayerLocation(nextEntity.posX, nextEntity.posY, nextEntity.posZ, yawDirection, pitchDirection);
                                     BowItem itemBow = (BowItem)heldItemStack.getItem();
-                                    synchronized(TurnBasedMinecraftMod.proxy.getAttackerViaBowSet())
-                                    {
                                     TurnBasedMinecraftMod.proxy.getAttackerViaBowSet().add(new AttackerViaBow(nextEntity, getId()));
-                                    }
                                     itemBow.onPlayerStoppedUsing(((PlayerEntity)nextEntity).getHeldItemMainhand(), nextEntity.getEntityWorld(), (LivingEntity) nextEntity, randomTimeLeft);
                                     sendMessageToAllPlayers(PacketBattleMessage.MessageType.FIRED_ARROW, nextEntity.getEntityId(), targetEntity.getEntityId(), 0);
                                 }

src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleManager.java

@@ -276,15 +276,12 @@ public class BattleManager
     private Battle createBattle(Collection<Entity> sideA, Collection<Entity> sideB, DimensionType dimension)
     {
         Battle newBattle = null;
-        synchronized(battleMap)
-        {
         while(battleMap.containsKey(IDCounter))
         {
             ++IDCounter;
         }
         newBattle = new Battle(this, IDCounter, sideA, sideB, true, dimension);
         battleMap.put(IDCounter, newBattle);
-        }
         for(Entity e : sideA) {
             entityToBattleMap.put(new EntityIDDimPair(e), newBattle.getId());
         }
@@ -296,21 +293,15 @@ public class BattleManager
     }
     
     public Battle getBattleByID(int id)
-    {
-        synchronized(battleMap)
     {
         return battleMap.get(id);
     }
-    }
     
     public void cleanup()
     {
         battleUpdater.setRunning(false);
         MinecraftForge.EVENT_BUS.unregister(battleUpdater);
-        synchronized(battleMap)
-        {
         battleMap.clear();
-        }
         battleUpdater = null;
     }
     
@@ -321,17 +312,13 @@ public class BattleManager
         if(c.entity instanceof ServerPlayerEntity) {
             TurnBasedMinecraftMod.getHandler().send(PacketDistributor.PLAYER.with(()->(ServerPlayerEntity) c.entity), new PacketGeneralMessage("You just left battle! " + config.getLeaveBattleCooldownSeconds() + " seconds until you can attack/be-attacked again!"));
         }
-        synchronized(recentlyLeftBattle) {
         recentlyLeftBattle.put(c.entity.getEntityId(), c);
-        }
         entityToBattleMap.remove(new EntityIDDimPair(c.entity));
     }
     
     protected void updateRecentlyLeftBattle()
     {
         long current = System.nanoTime();
-        synchronized(recentlyLeftBattle)
-        {
         for(Iterator<Map.Entry<Integer, Combatant>> iter = recentlyLeftBattle.entrySet().iterator(); iter.hasNext();)
         {
             Map.Entry<Integer, Combatant> entry = iter.next();
@@ -345,15 +332,11 @@ public class BattleManager
             }
         }
     }
-    }
     
     public boolean isRecentlyLeftBattle(int entityID)
-    {
-        synchronized(recentlyLeftBattle)
     {
         return recentlyLeftBattle.containsKey(entityID);
     }
-    }
 
     public boolean forceLeaveBattle(EntityIDDimPair entityInfo) {
         boolean result = false;