update messages, remove system print

This commit is contained in:
RedSparr0w 2019-09-22 18:29:54 +12:00
parent 9edca5beb5
commit 4531f75ec8

View file

@ -62,12 +62,11 @@ public class GlobalEventManager implements CallBack {
if (entry.getValue() > 0) { if (entry.getValue() > 0) {
entry.setValue(--ticksRemaining); entry.setValue(--ticksRemaining);
if (ticksRemaining == 3000) 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) { 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."); notify("The " + eventName + " event is live, clones are located near the mage arena.");
} else { } else {
if (entry.getValue() == 0) { 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 { } 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); entry.setValue(entry.getValue() + timeToAdd);