diff --git a/pom.xml b/pom.xml
index 75b5337..e08d0a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
17
1.16
UTF-8
- 0.99.1.0
+ 0.99.5.0
diff --git a/src/com/palmergames/bukkit/TownyChat/Chat.java b/src/com/palmergames/bukkit/TownyChat/Chat.java
index aa871f3..12af098 100644
--- a/src/com/palmergames/bukkit/TownyChat/Chat.java
+++ b/src/com/palmergames/bukkit/TownyChat/Chat.java
@@ -59,7 +59,7 @@ public class Chat extends JavaPlugin {
private DynmapAPI dynMap = null;
private Essentials essentials = null;
- private static String requiredTownyVersion = "0.99.1.0";
+ private static String requiredTownyVersion = "0.99.5.0";
public static boolean usingPlaceholderAPI = false;
public static boolean usingEssentialsDiscord = false;
boolean chatConfigError = false;
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java
index 23e59a1..e7f061d 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java
@@ -80,7 +80,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
} else {
// Console
for (String line : channel_help) {
- sender.sendMessage(Colors.strip(line));
+ TownyMessaging.sendMessage(sender, Colors.strip(line));
return true;
}
}
@@ -91,7 +91,7 @@ private void parseChannelCommand(Player player, String[] split) {
// So they just type /channel , We should probably send them to the help menu..
if (split.length == 0 || split[0].equalsIgnoreCase("help") || split[0].equalsIgnoreCase("?")) {
for (String line : channel_help)
- player.sendMessage(line);
+ TownyMessaging.sendMessage(player, line);
} else if (split[0].equalsIgnoreCase("join")) { // /channel join [chn] (/label args[0] args[1] length = 2.)
parseChannelJoin(player, StringMgmt.remFirstArg(split));
} else if (split[0].equalsIgnoreCase("leave")) {
@@ -130,7 +130,7 @@ public static void parseChannelList(Player player) {
public static void parseChannelMuteList(Player player, String[] split) {
if (split.length == 0) {
for (String line : channel_help) {
- player.sendMessage(line);
+ TownyMessaging.sendMessage(player, line);
}
return;
}
@@ -194,7 +194,7 @@ public static void parseChannelMuteList(Player player, String[] split) {
public static void parseChannelMute(Player player, String[] split, boolean mute) {
if (split.length < 2) {
for (String line : channel_help) {
- player.sendMessage(line);
+ TownyMessaging.sendMessage(player, line);
}
return;
}
@@ -277,7 +277,7 @@ public static void parseChannelMute(Player player, String[] split, boolean mute)
public static void parseChannelLeave(Player player, String[] split) {
if (split.length == 0) {
for (String line : channel_help) {
- player.sendMessage(line);
+ TownyMessaging.sendMessage(player, line);
}
return;
}
@@ -341,7 +341,7 @@ public static void parseChannelLeave(Player player, String[] split) {
public static void parseChannelJoin(Player player, String[] split) {
if (split.length == 0) {
for (String line : channel_help) {
- player.sendMessage(line);
+ TownyMessaging.sendMessage(player, line);
}
return;
}
@@ -390,7 +390,7 @@ public static void parseChannelJoin(Player player, String[] split) {
public static void parseChannelSoundToggle(Player player, String[] split) {
if (split.length == 0) {
for (String line : channel_help) {
- player.sendMessage(line);
+ TownyMessaging.sendMessage(player, line);
}
return;
}
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java
index c8d30db..f484430 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java
@@ -43,13 +43,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
}
private void parseTownyChatCommand(CommandSender sender, String[] split) {
- if (split.length == 0) { // So they just type /channel , We should probably send them to the help menu..
+ if (split.length == 0 || split[0].equalsIgnoreCase("help") || split[0].equalsIgnoreCase("?")) {
for (String line : townychat_help) {
- sender.sendMessage(line);
- }
- } else if (split[0].equalsIgnoreCase("help") || split[0].equalsIgnoreCase("?")) {
- for (String line : townychat_help) {
- sender.sendMessage(line);
+ TownyMessaging.sendMessage(sender, line);
}
} else if (split[0].equalsIgnoreCase("reload")) {
plugin.reload();
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java
index f0b398f..c8f55e1 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java
@@ -88,7 +88,7 @@ public boolean execute(CommandSender commandSender, String label, String[] args)
}
return true;
} else {
- commandSender.sendMessage("You may not use this command as the console!");
+ TownyMessaging.sendMsg("You may not use this command as the console!");
return false;
}
}
diff --git a/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java b/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java
index 17c0c30..39f08d2 100644
--- a/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java
+++ b/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java
@@ -192,7 +192,7 @@ private boolean testDistance(Player player1, Player player2, double range) {
private void trySendingAloneMessage(Player sender, Set recipients) {
if (ChatSettings.isUsingAloneMessage() &&
recipients.stream().filter(p -> sender.canSee(p)).count() < 2) // sender will usually be a recipient of their own message.
- sender.sendMessage(Colors.translateColorCodes(ChatSettings.getUsingAloneMessageString()));
+ TownyMessaging.sendMessage(sender, ChatSettings.getUsingAloneMessageString());
}
private void applyFormats(AsyncPlayerChatEvent event, String originalFormat, String workingFormat, Resident resident) {
@@ -286,7 +286,7 @@ private void sendSpyMessage(AsyncPlayerChatEvent event, channelTypes type) {
// Remove spies who've already seen the message naturally.
spies.stream()
.filter(spy -> !recipients.contains(spy))
- .forEach(spy -> spy.sendMessage(format + message));
+ .forEach(spy -> TownyMessaging.sendMessage(spy, format + message));
}
/**