diff --git a/src/engine/gameManager/ArenaManager.java b/src/engine/gameManager/ArenaManager.java index 4c95e2ae..74d5513c 100644 --- a/src/engine/gameManager/ArenaManager.java +++ b/src/engine/gameManager/ArenaManager.java @@ -20,6 +20,9 @@ public class ArenaManager { lastExecution = System.currentTimeMillis(); } + if(activeArenas.isEmpty() && playerQueue.isEmpty()) + return; + Iterator iterator = activeArenas.iterator(); while (iterator.hasNext()) { diff --git a/src/engine/gameManager/SimulationManager.java b/src/engine/gameManager/SimulationManager.java index 6e9d4423..da30fb74 100644 --- a/src/engine/gameManager/SimulationManager.java +++ b/src/engine/gameManager/SimulationManager.java @@ -114,8 +114,16 @@ public enum SimulationManager { try { if ((_cityPulseTime != 0) && (System.currentTimeMillis() > _cityPulseTime)) { - pulseCities(); - ArenaManager.pulseArenas(); + try { + pulseCities(); + }catch(Exception e){ + + } + try { + ArenaManager.pulseArenas(); + }catch(Exception e){ + + } } } catch (Exception e) { Logger.error( diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java index e2bf2df4..f506d399 100644 --- a/src/engine/objects/Contract.java +++ b/src/engine/objects/Contract.java @@ -203,16 +203,16 @@ public class Contract extends AbstractGameObject { switch(optionId){ case 15020431: - if(pc.isBoxed){ - ChatManager.chatSystemInfo(pc, "You Cannot Join The Que, You Are Boxed"); - }else { + //if(pc.isBoxed){ + // ChatManager.chatSystemInfo(pc, "You Cannot Join The Que, You Are Boxed"); + //}else { if (ArenaManager.playerQueue.contains(pc)) { ChatManager.chatSystemInfo(pc, "You Are Already In The Arena Que"); } else { ArenaManager.joinQueue(pc); ChatManager.chatSystemInfo(pc, "You Have Joined The Arena Que"); } - } + //} break; case 15020432: if(ArenaManager.playerQueue.contains(pc)) {