diff --git a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java index e6d11f322..d5929137e 100644 --- a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java +++ b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java @@ -58,18 +58,20 @@ public class GlobalEventManager implements CallBack { while(iterator.hasNext()) { Map.Entry entry = iterator.next(); + Long ticksRemaining = entry.getValue(); if (entry.getValue() > 0) { - entry.setValue(entry.getValue() - 1); - if (entry.getValue() == 3000) + entry.setValue(--ticksRemaining); + if (ticksRemaining == 3000) message("You have 30 minutes before the " + entry.getKey() + " event ends on world " + GameWorld.getSettings().getWorldId() + "."); - if (entry.getValue() <= 0) { + if (ticksRemaining <= 0) { message("The " + entry.getKey() + " event has now ended on world " + GameWorld.getSettings().getWorldId() + "."); } + System.out.println("The " + entry.getKey() + " event has " + ticksRemaining + " ticks remaining"); } } - if (tick == 50) { + if (tick == 100) { tick = 0; save(); } diff --git a/09HDscape-server/src/org/crandor/game/world/GameWorld.java b/09HDscape-server/src/org/crandor/game/world/GameWorld.java index 5f29517ff..8a2e289b7 100644 --- a/09HDscape-server/src/org/crandor/game/world/GameWorld.java +++ b/09HDscape-server/src/org/crandor/game/world/GameWorld.java @@ -139,7 +139,7 @@ public final class GameWorld { switch(cfTicks) { case 100: if (checkDay()) { - GlobalEventManager.get().activate("Clone Fest", null); + GlobalEventManager.get().activate("Clone Fest", null, 2000); if (GlobalEventManager.get().isActive("Clone Fest")) { int size = 20; if (PVPAIPActions.pvp_players == null) { @@ -162,15 +162,7 @@ public final class GameWorld { } } break; - case 1100: - if (PVPAIPActions.pvp_players == null) { - GlobalEventManager.get().deactivate("Clone Fest"); - } - break; - case 1500: - GlobalEventManager.get().deactivate("Clone Fest"); - break; - case 1900: + case 2100: cfTicks = 0; break; } diff --git a/09HDscape-server/src/org/crandor/game/world/callback/CallbackHub.java b/09HDscape-server/src/org/crandor/game/world/callback/CallbackHub.java index 9b2ab4cd6..606675a87 100644 --- a/09HDscape-server/src/org/crandor/game/world/callback/CallbackHub.java +++ b/09HDscape-server/src/org/crandor/game/world/callback/CallbackHub.java @@ -4,6 +4,7 @@ import org.crandor.game.content.eco.ge.GEOfferDispatch; import org.crandor.game.content.holiday.HolidayEvent; import org.crandor.game.content.skill.member.farming.FarmingPulse; import org.crandor.game.content.skill.member.hunter.ImpetuousImpulses; +import org.crandor.game.events.GlobalEventManager; import org.crandor.game.system.SystemLogger; import org.crandor.game.world.map.zone.ZoneBuilder; @@ -40,7 +41,7 @@ public final class CallbackHub { calls.add(new GEOfferDispatch()); calls.add(new FarmingPulse()); calls.add(new ImpetuousImpulses()); -// calls.add(GlobalEventManager.get()); + calls.add(GlobalEventManager.get()); for (CallBack call : calls) { if (!call.call()) { SystemLogger.error("A callback was stopped, callback=" + call.getClass().getSimpleName() + ".");