Arena System

src/engine/gameManager/ArenaManager.java

@@ -20,6 +20,9 @@ public class ArenaManager {
             lastExecution = System.currentTimeMillis();
         }
 
+        if(activeArenas.isEmpty() && playerQueue.isEmpty())
+            return;
+
         Iterator<Arena> iterator = activeArenas.iterator();
 
         while (iterator.hasNext()) {

src/engine/gameManager/SimulationManager.java

@@ -114,8 +114,16 @@ public enum SimulationManager {
 
         try {
             if ((_cityPulseTime != 0) && (System.currentTimeMillis() > _cityPulseTime)) {
-                pulseCities();
+                try {
-                ArenaManager.pulseArenas();
+                    pulseCities();
+                }catch(Exception e){
+
+                }
+                try {
+                    ArenaManager.pulseArenas();
+                }catch(Exception e){
+
+                }
             }
         } catch (Exception e) {
             Logger.error(

src/engine/objects/Contract.java

@@ -203,16 +203,16 @@ public class Contract extends AbstractGameObject {
 
         switch(optionId){
             case 15020431:
-                if(pc.isBoxed){
+                //if(pc.isBoxed){
-                    ChatManager.chatSystemInfo(pc, "You Cannot Join The Que, You Are Boxed");
+                //    ChatManager.chatSystemInfo(pc, "You Cannot Join The Que, You Are Boxed");
-                }else {
+                //}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)) {