From a9b9932a0859f8ee2b115fea80300c797be1f477 Mon Sep 17 00:00:00 2001 From: Roland von Rotz Date: Tue, 1 Oct 2019 09:45:06 +0200 Subject: [PATCH] Add BedEnter/BedLeave Events & continue refactoring --- .../java/xyz/nkomarn/Harbor/listener/PlayerListener.java | 4 ++-- src/main/java/xyz/nkomarn/Harbor/util/Message.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java b/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java index ac73528..ee764dd 100644 --- a/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java +++ b/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java @@ -18,7 +18,7 @@ public class PlayerListener implements Listener { } final World world = event.getPlayer().getWorld(); if (morePlayerNeeded(world)) { - Message.SendChatMessage("messages.chat.sleeping"); + Message.SendChatMessage(world, "messages.chat.sleeping"); Message.SendActionbarMessage(world, "messages.actionbar.sleeping"); } } @@ -27,7 +27,7 @@ public class PlayerListener implements Listener { public void onBedLeave(final PlayerBedLeaveEvent event) { final World world = event.getPlayer().getWorld(); if (Checker.isNight(world) && !Checker.skippingWorlds.contains(world) && morePlayerNeeded(world)) { - Message.SendChatMessage("messages.chat.left"); + Message.SendChatMessage(world, "messages.chat.left"); } } diff --git a/src/main/java/xyz/nkomarn/Harbor/util/Message.java b/src/main/java/xyz/nkomarn/Harbor/util/Message.java index 190554f..330a15f 100644 --- a/src/main/java/xyz/nkomarn/Harbor/util/Message.java +++ b/src/main/java/xyz/nkomarn/Harbor/util/Message.java @@ -12,13 +12,13 @@ import java.util.List; import java.util.Random; public class Message { - public static void SendChatMessage(final String messageLocation) { - sendChatMessage(Config.getString(messageLocation)); + public static void SendChatMessage(final World world, final String messageLocation) { + sendChatMessage(prepareMessageWithParams(Config.getString(messageLocation), world)); } public static void SendActionbarMessage(final World world, final String messageLocation) { if (Config.getBoolean("messages.actionbar.actionbar")) { - final String message = Message.prepareMessageWithParams(Config.getString(messageLocation), world); + final String message = prepareMessageWithParams(Config.getString(messageLocation), world); world.getPlayers().forEach(p -> sendActionbarMessage(p, message)); } }