Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-10 10:28:22 +01:00
Code Issues Projects Releases Wiki Activity

We have added the ability for the Mute to contain a reason, which is stored for the duration of the mute in the user's data file. Currently we need to add in the mute reason code into some other commands such as /afk and /me and /seen ect. We will also need to fix a problem with the reason when we dont add in a time frame for the mute, which should mute the player indefinatly rather then cancelling the mute and throwing a DataFormat exception.

Browse Source
This commit is contained in:
CreedTheFreak 2017-09-03 14:41:32 -07:00 committed by delbertina
parent 9378df0ff2
commit 4f8ea06db1
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -80,7 +80,14 @@ public class EssentialsPlayerListener implements Listener {
final User user = ess.getUser(event.getPlayer());
if (user.isMuted()) {
event.setCancelled(true);
user.sendMessage(tl("voiceSilenced"));
if (user.getMuteReason ().equals ("")) {
user.sendMessage(tl("voiceSilenced"));
}
else {
user.sendMessage(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
}
LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage()));
}
try {

1
Essentials/src/com/earth2me/essentials/User.java
View File

@ -538,6 +538,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
setMuteTimeout(0);
sendMessage(tl("canTalkAgain"));
setMuted(false);
setMuteReason ("");
return true;
}
}

8
Essentials/src/com/earth2me/essentials/UserData.java
View File

@ -522,8 +522,12 @@ public abstract class UserData extends PlayerExtension implements IConf {
}
public void setMuteReason (String reason) {
muteReason = reason;
config.setProperty ("muteReason", reason);
if (reason.equals("")) {
config.removeProperty ("muteReason");
} else {
muteReason = reason;
config.setProperty ("muteReason", reason);
}
config.save();
}

3
Essentials/src/messages.properties
View File

@ -558,6 +558,7 @@ 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.
@ -601,4 +602,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.