From 8f176e194453838dfafeb6b19c510214abb9663f Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Sun, 22 Sep 2019 15:22:54 +1200
Subject: [PATCH] refactor eventticks

---
 .../src/org/crandor/game/world/GameWorld.java | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/09HDscape-server/src/org/crandor/game/world/GameWorld.java b/09HDscape-server/src/org/crandor/game/world/GameWorld.java
index 40da8af5a..5f29517ff 100644
--- a/09HDscape-server/src/org/crandor/game/world/GameWorld.java
+++ b/09HDscape-server/src/org/crandor/game/world/GameWorld.java
@@ -135,10 +135,9 @@ public final class GameWorld {
         pulses.clear();
         ticks++;
         eventTicks++;
-        int idx = new Random().nextInt(hourlyEvent.length);
-        String random = hourlyEvent[idx];
-        switch(cfTicks++) {
-            case 50:
+        cfTicks++;
+        switch(cfTicks) {
+            case 100:
                 if (checkDay()) {
                     GlobalEventManager.get().activate("Clone Fest", null);
                     if (GlobalEventManager.get().isActive("Clone Fest")) {
@@ -163,34 +162,28 @@ public final class GameWorld {
                     }
                 }
                 break;
-            case 1000:
+            case 1100:
                 if (PVPAIPActions.pvp_players == null) {
                     GlobalEventManager.get().deactivate("Clone Fest");
                 }
                 break;
             case 1500:
-                if (PVPAIPActions.pvp_players == null) {
-                    GlobalEventManager.get().deactivate("Clone Fest");
-                }
+                GlobalEventManager.get().deactivate("Clone Fest");
                 break;
             case 1900:
                 cfTicks = 0;
                 break;
         }
         switch (eventTicks) {
-            case 100:
-                if (GlobalEventManager.get().getLastEvent() == random) {
-                    random = (hourlyEvent[idx]);
-                }
-                String event = random;
+        	// 2 minute gap between events
+            case 200:
+                int randomEventId = new Random().nextInt(hourlyEvent.length);
+                String event = hourlyEvent[randomEventId];
 
                 GlobalEventManager.get().setLastEvent(event);
                 GlobalEventManager.get().setCurrentEvent(event);
                 GlobalEventManager.get().activateHourly(event);
                 break;
-            case 6100:
-                GlobalEventManager.get().deactivate(GlobalEventManager.get().getCurrentEvent());
-                break;
             case 6200:
                 eventTicks = 0;
                 break;