Upstream/Harbor-Minecraft
1
0
Fork 0
mirror of https://github.com/nkomarn/harbor.git synced 2024-12-18 22:37:36 +01:00
Code Issues Projects Releases Wiki Activity

Chat messges should go only to players in the same world

Browse Source
This commit is contained in:
Roland von Rotz 2019-10-04 21:04:54 +02:00
parent b496a022c9
commit e3f5d63da8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/xyz/nkomarn/Harbor/task/AccelerateNightTask.java
View File

@ -20,7 +20,7 @@ public class AccelerateNightTask extends BukkitRunnable {
world.setTime(time + Config.getInteger("values.timeSkipInterval")); world.setTime(time + Config.getInteger("values.timeSkipInterval"));
} else { } else {
// Announce night skip and clear queue // Announce night skip and clear queue
Message.SendRandomChatMessage("messages.chat.skipped"); Message.SendRandomChatMessage(world, "messages.chat.skipped");
Checker.skippingWorlds.remove(world); Checker.skippingWorlds.remove(world);
// Reset sleep statistic if phantoms are disabled // Reset sleep statistic if phantoms are disabled

16
src/main/java/xyz/nkomarn/Harbor/util/Message.java
View File

@ -2,7 +2,6 @@ package xyz.nkomarn.Harbor.util;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -13,7 +12,10 @@ import java.util.Random;
public class Message { public class Message {
public static void SendChatMessage(final World world, final String messageLocation, final String playerName, final int change) { public static void SendChatMessage(final World world, final String messageLocation, final String playerName, final int change) {
sendChatMessage(prepareMessageWithParams(Config.getString(messageLocation), world, playerName, change)); if (Config.getBoolean("messages.chat.chat")) {
final String message = prepareMessageWithParams(Config.getString(messageLocation), world, playerName, change);
world.getPlayers().forEach(p -> sendChatMessage(p, message));
}
} }
public static void SendActionbarMessage(final World world, final String messageLocation, final String playerName, final int change) { public static void SendActionbarMessage(final World world, final String messageLocation, final String playerName, final int change) {
@ -23,16 +25,14 @@ public class Message {
} }
} }
public static void SendRandomChatMessage(final String messageListLocation) { public static void SendRandomChatMessage(final World world, final String messageListLocation) {
final List<String> messages = Config.getList(messageListLocation); final List<String> messages = Config.getList(messageListLocation);
final int index = new Random().nextInt(messages.size()); final int index = new Random().nextInt(messages.size());
sendChatMessage(messages.get(index)); world.getPlayers().forEach(p -> sendChatMessage(p, messages.get(index)));
} }
private static void sendChatMessage(final String message) { private static void sendChatMessage(final Player player, final String message) {
if (Config.getBoolean("messages.chat.chat") && message.length() > 0) { player.sendMessage(ChatColor.translateAlternateColorCodes('&', message));
Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', message));
}
} }
private static void sendActionbarMessage(final Player player, final String message) { private static void sendActionbarMessage(final Player player, final String message) {