From 4531f75ec89147a5a88e3cfd5c5cdd7f55ff3993 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sun, 22 Sep 2019 18:29:54 +1200 Subject: [PATCH] update messages, remove system print --- .../src/org/crandor/game/events/GlobalEventManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java index d5929137e..454a42764 100644 --- a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java +++ b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java @@ -62,12 +62,11 @@ public class GlobalEventManager implements CallBack { if (entry.getValue() > 0) { entry.setValue(--ticksRemaining); if (ticksRemaining == 3000) - message("You have 30 minutes before the " + entry.getKey() + " event ends on world " + GameWorld.getSettings().getWorldId() + "."); + message("You have 30 minutes before the " + entry.getKey() + " event ends."); if (ticksRemaining <= 0) { - message("The " + entry.getKey() + " event has now ended on world " + GameWorld.getSettings().getWorldId() + "."); + message("The " + entry.getKey() + " event has now ended."); } - System.out.println("The " + entry.getKey() + " event has " + ticksRemaining + " ticks remaining"); } } @@ -213,9 +212,9 @@ public class GlobalEventManager implements CallBack { notify("The " + eventName + " event is live, clones are located near the mage arena."); } else { if (entry.getValue() == 0) { - message("The " + eventName + " event has been activated" + (player == null ? "" : " by " + player.getUsername()) + "."); + message("The " + eventName + " event has been activated for " + Math.round(timeToAdd / 100) + " minutes" + (player == null ? "" : " by " + player.getUsername()) + "."); } else { - message("The " + eventName + " event has been extended for another hour" + (player == null ? "" : " by " + player.getUsername()) + "."); + message("The " + eventName + " event has been extended by " + Math.round(timeToAdd / 100) + " minutes" + (player == null ? "" : " by " + player.getUsername()) + "."); } } entry.setValue(entry.getValue() + timeToAdd);