From 12df853b018ee80e9cca1f782e24d365b375db40 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 10 Jul 2020 16:36:45 -0700 Subject: [PATCH] fixed 2 lang issues v0.1.1 Signed-off-by: Jake Potrebic --- pom.xml | 2 +- src/main/java/me/machinemaker/vanillatweaks/Lang.java | 5 +++++ .../vanillatweaks/multiplayersleep/MultiplayerSleep.java | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2b7fd819..bc8554c6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.machinemaker vanillatweaks - 0.1.0 + 0.1.1 jar VanillaTweaks diff --git a/src/main/java/me/machinemaker/vanillatweaks/Lang.java b/src/main/java/me/machinemaker/vanillatweaks/Lang.java index 566f3903..7e73ccaf 100644 --- a/src/main/java/me/machinemaker/vanillatweaks/Lang.java +++ b/src/main/java/me/machinemaker/vanillatweaks/Lang.java @@ -102,4 +102,9 @@ else if (!config.get().getString(m.getPath()).equals(m.getMsg())) public static void reload() { Lang.config.reload(); } + + @Override + public String toString() { + return ChatColor.translateAlternateColorCodes('&', this.msg); + } } diff --git a/src/main/java/me/machinemaker/vanillatweaks/multiplayersleep/MultiplayerSleep.java b/src/main/java/me/machinemaker/vanillatweaks/multiplayersleep/MultiplayerSleep.java index 38b527ce..f2136779 100644 --- a/src/main/java/me/machinemaker/vanillatweaks/multiplayersleep/MultiplayerSleep.java +++ b/src/main/java/me/machinemaker/vanillatweaks/multiplayersleep/MultiplayerSleep.java @@ -5,6 +5,7 @@ import me.machinemaker.vanillatweaks.BaseModule; import me.machinemaker.vanillatweaks.VanillaTweaks; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -47,7 +48,7 @@ public void onPlayerBedEnter(PlayerBedEnterEvent event) { if (currentWorldSleeping.contains(event.getPlayer())) return; currentWorldSleeping.add(event.getPlayer()); worlds.forEach(world -> { - world.getPlayers().forEach(player -> player.sendMessage(event.getPlayer().getDisplayName() + " is sleeping, " + currentWorldSleeping.size() + "/" + world.getPlayers().size())); + world.getPlayers().forEach(player -> player.sendMessage(ChatColor.YELLOW + event.getPlayer().getDisplayName() + " is sleeping (" + currentWorldSleeping.size() + "/" + world.getPlayers().size() + ").")); if ((double) currentWorldSleeping.size() / (double) world.getPlayers().size() >= config.sleepPercentage) { event.getPlayer().getWorld().setTime(0);