From 67d3fec2c50756c189a0c6855b0ece1aeff81c78 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Mon, 23 Sep 2019 01:26:22 +1200 Subject: [PATCH] [events] fix null point erro --- .../crandor/game/events/GlobalEventManager.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java index 4b0bd9b41..fce784a18 100644 --- a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java +++ b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java @@ -110,17 +110,9 @@ public class GlobalEventManager implements CallBack { return message(message, tag, ""); } - public GlobalEventManager notify(String message) { - return message(message, true, ""); - } - - public GlobalEventManager notify(String message, boolean tag) { - return message(message, tag, ""); - } - public GlobalEventManager message(String message, boolean tag, String color) { for (Player player : Repository.getPlayers()) { - player.getPacketDispatch().sendMessage(color + (tag ? "[Event Manager] " : "") + message); + player.sendMessage(color + (tag ? "[Event Manager] " : "") + message); } return this; } @@ -161,7 +153,7 @@ public class GlobalEventManager implements CallBack { // start the event after building the string event.start(timeToAdd); message(message.toString()); - player.sendMessage(event.getDescription()); + message(event.getDescription(), false, "ecf0f1"); return this; } @@ -169,9 +161,7 @@ public class GlobalEventManager implements CallBack { public GlobalEventManager activateHourly(GlobalEvent event) { event.start(6000); message(event.getName() + " event is now active, and will run for an hour!"); - for (Player player : Repository.getPlayers()) { - player.sendMessage(event.getDescription()); - } + message(event.getDescription(), false, "ecf0f1"); return this; }