diff --git a/pom.xml b/pom.xml
index 7612d20..1b854ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.palmergames.bukkit
TownyChat
jar
- 0.78
+ 0.79
diff --git a/resources/changelog.txt b/resources/changelog.txt
index 935475f..c865306 100644
--- a/resources/changelog.txt
+++ b/resources/changelog.txt
@@ -333,4 +333,8 @@ v0.78:
- Dynmap added to softdepends list, courtesy of ZombiMigz with PR #31.
- Allow for colouring the alone message.
- Adapt to change in Towny 0.96.2.17 Version code.
- - Build against 0.96.2.17, minimum required Towny version now 0.96.2.17.
\ No newline at end of file
+ - Build against 0.96.2.17, minimum required Towny version now 0.96.2.17.
+v0.79:
+ - Fix colouring the alone message.
+ - Replace TownyMessaging method used to send some TownyChat messages.
+ - Removes double prefixes ie: [Towny] [TownyChat] message....
\ No newline at end of file
diff --git a/src/com/palmergames/bukkit/TownyChat/Chat.java b/src/com/palmergames/bukkit/TownyChat/Chat.java
index 78003bc..e5f156f 100644
--- a/src/com/palmergames/bukkit/TownyChat/Chat.java
+++ b/src/com/palmergames/bukkit/TownyChat/Chat.java
@@ -135,7 +135,7 @@ private void checkPlugins() {
towny = (Towny) test;
test = pm.getPlugin("dynmap");
- if (test != null) {
+ if (test != null && pm.getPlugin("dynmap").isEnabled()) {
dynMap = (DynmapAPI) test;
}
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java
index 55825be..faf9f20 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/ChannelCommand.java
@@ -252,11 +252,11 @@ public static void parseChannelMute(Player player, String[] split, boolean mute)
}
if (!chan.mute(split[1])) {
- TownyMessaging.sendMsg(player, Translation.of("tc_player_already_muted_in_channel", chan.getName()));
+ TownyMessaging.sendMessage(player, Translation.of("tc_player_already_muted_in_channel", chan.getName()));
return;
}
- TownyMessaging.sendMsg(player, Translation.of("tc_player_is_now_muted_in_channel", split[1], chan.getName()));
+ TownyMessaging.sendMessage(player, Translation.of("tc_player_is_now_muted_in_channel", split[1], chan.getName()));
} else if (!mute) {
String unmutePerm = plugin.getChannelsHandler().getUnmutePermission();
if ((unmutePerm == null) || (unmutePerm != null && (!TownyUniverse.getInstance().getPermissionSource().has(player, unmutePerm)))) {
@@ -268,11 +268,11 @@ public static void parseChannelMute(Player player, String[] split, boolean mute)
if (!chan.unmute(split[1])) {
- TownyMessaging.sendMsg(player, Translation.of("tc_player_is_not_muted_in_channel", chan.getName()));
+ TownyMessaging.sendMessage(player, Translation.of("tc_player_is_not_muted_in_channel", chan.getName()));
return;
}
- TownyMessaging.sendMsg(player, Translation.of("tc_player_is_now_unmuted_in_channel", split[1], chan.getName()));
+ TownyMessaging.sendMessage(player, Translation.of("tc_player_is_now_unmuted_in_channel", split[1], chan.getName()));
return;
}
}
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java
index 554595b..ef9388f 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/TownyChatCommand.java
@@ -53,7 +53,7 @@ private void parseTownyChatCommand(CommandSender sender, String[] split) {
}
} else if (split[0].equalsIgnoreCase("reload")) {
plugin.reload();
- TownyMessaging.sendMsg(sender, Translation.of("tc_settings_reloaded"));
+ TownyMessaging.sendMessage(sender, Translation.of("tc_settings_reloaded"));
} else {
TownyMessaging.sendErrorMsg(sender, Translation.of("tc_err_unrecognized_command_format"));
}
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java
index 59a6307..543c2d6 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/commandobjects/ChannelJoinAliasCommand.java
@@ -64,7 +64,7 @@ public boolean execute(CommandSender commandSender, String label, String[] args)
modes[i] = newModes.get(i);
plugin.getTowny().setPlayerMode(player, modes, false);
- TownyMessaging.sendMsg(player, String.format(Translation.of("tc_you_are_now_talking_in_channel"), channel.getName()));
+ TownyMessaging.sendMessage(player, String.format(Translation.of("tc_you_are_now_talking_in_channel"), channel.getName()));
return true;
}
} else {
diff --git a/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java b/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java
index 3f908f1..b1cb59b 100644
--- a/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java
+++ b/src/com/palmergames/bukkit/TownyChat/channels/StandardChannel.java
@@ -166,7 +166,7 @@ public void chatProcess(AsyncPlayerChatEvent event) {
}
if (notifyjoin) {
- TownyMessaging.sendMsg(player, "You join " + Colors.White + getName());
+ TownyMessaging.sendMessage(player, "You join " + Colors.White + getName());
}
/*
@@ -280,19 +280,14 @@ private Set findRecipients(Player sender, List list) {
}
}
- if ((recipients.size() <= 1) && (ChatSettings.isUsingAloneMessage())) {
+ if (recipients.size() <= 1 && ChatSettings.isUsingAloneMessage()) {
- String aloneMsg;
-
- if (Towny.is116Plus()) {
- aloneMsg = HexFormatter.translateHexColors(ChatSettings.getUsingAloneMessageString());
- } else {
- aloneMsg = ChatColor.translateAlternateColorCodes('&', ChatSettings.getUsingAloneMessageString());
- }
+ String aloneMsg = ChatSettings.getUsingAloneMessageString();
+ if (Towny.is116Plus())
+ aloneMsg = HexFormatter.translateHexColors(aloneMsg);
- sender.sendMessage(aloneMsg);
+ sender.sendMessage(ChatColor.translateAlternateColorCodes('&', aloneMsg));
}
-
return recipients;
}