mirror of
https://github.com/YouHaveTrouble/PreventStabby.git
synced 2026-05-11 21:06:55 +00:00
actually check for empty string and not for null
This commit is contained in:
@@ -24,7 +24,6 @@ public class PluginMessages {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Component parseMessage(CommandSender sender,String message) {
|
public static Component parseMessage(CommandSender sender,String message) {
|
||||||
|
|
||||||
if (sender instanceof Player && isPlaceholderApiEnabled()) {
|
if (sender instanceof Player && isPlaceholderApiEnabled()) {
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
message = PlaceholderAPI.setPlaceholders(player, message);
|
message = PlaceholderAPI.setPlaceholders(player, message);
|
||||||
@@ -37,18 +36,18 @@ public class PluginMessages {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendMessage(CommandSender sender, String message) {
|
public static void sendMessage(CommandSender sender, String message) {
|
||||||
if (message == null) return;
|
if ("".equals(message)) return;
|
||||||
audiences.sender(sender).sendMessage(parseMessage(sender, message));
|
audiences.sender(sender).sendMessage(parseMessage(sender, message));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendActionBar(Player player, String message) {
|
public static void sendActionBar(Player player, String message) {
|
||||||
if (message == null) return;
|
if ("".equals(message)) return;
|
||||||
Component parsedMessage = parseMessage(player, message);
|
Component parsedMessage = parseMessage(player, message);
|
||||||
audiences.player(player).sendActionBar(parsedMessage);
|
audiences.player(player).sendActionBar(parsedMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendActionBar(UUID uuid, String message) {
|
public static void sendActionBar(UUID uuid, String message) {
|
||||||
if (message == null) return;
|
if ("".equals(message)) return;
|
||||||
Player player = Bukkit.getPlayer(uuid);
|
Player player = Bukkit.getPlayer(uuid);
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
sendActionBar(player, message);
|
sendActionBar(player, message);
|
||||||
@@ -60,7 +59,7 @@ public class PluginMessages {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void broadcastMessage(Player player, String message) {
|
public static void broadcastMessage(Player player, String message) {
|
||||||
if (message == null) return;
|
if ("".equals(message)) return;
|
||||||
message = parsePlayerName(player, message);
|
message = parsePlayerName(player, message);
|
||||||
if (PreventStabby.getPlugin().getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
|
if (PreventStabby.getPlugin().getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
|
||||||
message = PlaceholderAPI.setPlaceholders(player, message);
|
message = PlaceholderAPI.setPlaceholders(player, message);
|
||||||
@@ -69,6 +68,7 @@ public class PluginMessages {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void broadcastMessage(String message) {
|
public static void broadcastMessage(String message) {
|
||||||
|
if ("".equals(message)) return;
|
||||||
audiences.all().sendMessage(parseMessage(message));
|
audiences.all().sendMessage(parseMessage(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user