TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-14 05:01:28 +00:00
Code Issues Projects Releases Wiki Activity

Changed muteFormat to muteReason.

Browse source 
Removed space at beginning of muteReason.
This commit is contained in:
delbertina 2017-11-26 01:32:22 -06:00
parent 574e1bc1e7
commit 7aad95ec08
10 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -85,7 +85,7 @@ public class EssentialsPlayerListener implements Listener {
user.sendMessage(tl("voiceSilenced"));
}
else {
user.sendMessage(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
user.sendMessage(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage()));

2
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View file

@ -55,7 +55,7 @@ public class Commandafk extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", sender.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", sender.getMuteReason ()));
}
}
if (!sender.isAuthorized("essentials.afk.message")) {

2
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
View file

@ -52,7 +52,7 @@ public class Commandmail extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
}

2
Essentials/src/com/earth2me/essentials/commands/Commandme.java
View file

@ -28,7 +28,7 @@ public class Commandme extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
}

12
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View file

@ -72,8 +72,8 @@ public class Commandmute extends EssentialsCommand {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime));
user.sendMessage(tl("playerMutedFor", muteTime));
} else {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteFormat",user.getMuteReason()));
user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteFormat",user.getMuteReason()));
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteReason",user.getMuteReason()));
user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteReason",user.getMuteReason()));
}
} else {
if (user.getMuteReason ().equals ("")) {
@ -82,9 +82,9 @@ public class Commandmute extends EssentialsCommand {
user.sendMessage(tl("playerMuted"));
}
else {
sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteFormat",user.getMuteReason()));
sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteReason",user.getMuteReason()));
/** Send the player a message, why they were muted **/
user.sendMessage(tl("playerMuted")+ tl("muteFormat",user.getMuteReason()));
user.sendMessage(tl("playerMuted")+ tl("muteReason",user.getMuteReason()));
}
}
final String message;
@ -93,14 +93,14 @@ public class Commandmute extends EssentialsCommand {
message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime);
}
else {
message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteFormat",user.getMuteReason()));
message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteReason",user.getMuteReason()));
}
} else {
if (user.getMuteReason ().equals ("")) {
message = tl("muteNotify", sender.getSender().getName(), user.getName());
}
else {
message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteFormat",user.getMuteReason()));
message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteReason",user.getMuteReason()));
}
}
server.getLogger().log(Level.INFO, message);

2
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View file

@ -32,7 +32,7 @@ public class Commandr extends EssentialsCommand {
throw new Exception(tl("voiceSilenced"));
}
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ()));
}
}

2
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View file

@ -121,7 +121,7 @@ public class Commandseen extends EssentialsCommand {
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))));
}
else {
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + tl("muteFormat", user.getMuteReason ()));
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + tl("muteReason", user.getMuteReason ()));
}
}
final String location = user.getGeoLocation();

2
Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
View file

@ -60,7 +60,7 @@ public class Commandwhois extends EssentialsCommand {
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))));
}
else {
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))+ tl("muteFormat", user.getMuteReason ())));
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))+ tl("muteReason", user.getMuteReason ())));
}
}

3
Essentials/src/messages.properties
View file

@ -558,7 +558,6 @@ vanished=\u00a76You are now completely invisible to normal users, and hidden fro
versionMismatch=\u00a74Version mismatch\! Please update {0} to the same version.
versionMismatchAll=\u00a74Version mismatch\! Please update all Essentials jars to the same version.
voiceSilenced=\u00a76Your voice has been silenced\!
muteFormat=\u00a74 Reason: {0}
walking=walking
warpDeleteError=\u00a74Problem deleting the warp file.
warpingTo=\u00a76Warping to\u00a7c {0}\u00a76.
@ -602,4 +601,4 @@ worthSet=\u00a76Worth value set
year=year
years=years
youAreHealed=\u00a76You have been healed.
youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail.
youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail.

2
Essentials/src/messages_cs.properties
View file

@ -601,4 +601,4 @@ worthSet=\u00a76Cena nastavena
year=rok
years=roky
youAreHealed=\u00a76Byl/a jsi uzdraven/a.
youHaveNewMail=\u00a76Mas \u00a7c{0} \u00a76zprav\! Napis \u00a7c/mail read\u00a76 pro precteni.
youHaveNewMail=\u00a76Mas \u00a7c{0} \u00a76zprav\! Napis \u00a7c/mail read\u00a76 pro precteni.