TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385

Browse source
This commit is contained in:
CreedTheFreak 2017-12-18 18:40:27 -08:00
commit 2975118e5b
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,12 +81,8 @@ public class EssentialsPlayerListener implements Listener {
if (user.isMuted()) { if (user.isMuted()) {
event.setCancelled(true); event.setCancelled(true);
if (user.getMuteReason().equals ("")) { user.sendMessage(tl("voiceSilenced") + (user.hasMuteReason() ?
user.sendMessage(tl("voiceSilenced")); (" " + tl("muteReason", user.getMuteReason())) : ""));
}
else {
user.sendMessage(tl("voiceSilenced") + " " + tl("muteReason", user.getMuteReason ()));
}
LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage())); LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage()));
} }

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

@ -538,7 +538,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
} }
public boolean hasMuteReason(){ public boolean hasMuteReason(){
return getMuteReason().equals(""); return !getMuteReason().equals("");
} }
private long muteTimeout; private long muteTimeout;

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

@ -117,7 +117,7 @@ public class Commandseen extends EssentialsCommand {
sender.sendMessage(tl("whoisJail", (user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true")))); sender.sendMessage(tl("whoisJail", (user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true"))));
} }
if (user.isMuted()) { if (user.isMuted()) {
throw new Exception(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + (user.hasMuteReason() ? sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + (user.hasMuteReason() ?
(" " + tl("muteReason", user.getMuteReason())) : "")); (" " + tl("muteReason", user.getMuteReason())) : ""));
} }
final String location = user.getGeoLocation(); final String location = user.getGeoLocation();

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

@ -56,7 +56,7 @@ public class Commandwhois extends EssentialsCommand {
sender.sendMessage(tl("whoisAFK", tl("false"))); sender.sendMessage(tl("whoisAFK", tl("false")));
} }
sender.sendMessage(tl("whoisJail", (user.isJailed() ? user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true") : tl("false")))); sender.sendMessage(tl("whoisJail", (user.isJailed() ? user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true") : tl("false"))));
throw new Exception(tl("voiceSilenced") + (user.hasMuteReason() ? sender.sendMessage(tl("whoisMuted") + (user.hasMuteReason() ?
(" " + tl("muteReason", user.getMuteReason())) : "")); (" " + tl("muteReason", user.getMuteReason())) : ""));
} }