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

fixed some wonky commit thing that happened, thus the following modifications are brought to you by Delbertina.

Browse source
This commit is contained in:
CreedTheFreak 2017-09-03 19:49:57 -07:00
parent 86315fed8d
commit f10a766442
6 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,8 +51,13 @@ public class Commandafk extends EssentialsCommand {
private void toggleAfk(User sender, User user, String message) throws Exception { private void toggleAfk(User sender, User user, String message) throws Exception {
if (message != null && sender != null) { if (message != null && sender != null) {
if (sender.isMuted()) { if (sender.isMuted()) {
if (sender.getMuteReason ().equals ("")) {
throw new Exception(tl("voiceSilenced")); throw new Exception(tl("voiceSilenced"));
} }
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", sender.getMuteReason ()));
}
}
if (!sender.isAuthorized("essentials.afk.message")) { if (!sender.isAuthorized("essentials.afk.message")) {
throw new Exception(tl("noPermToAFKMessage")); throw new Exception(tl("noPermToAFKMessage"));
} }

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

@ -48,8 +48,13 @@ public class Commandmail extends EssentialsCommand {
} }
if (user.isMuted()) { if (user.isMuted()) {
if (user.getMuteReason ().equals ("")) {
throw new Exception(tl("voiceSilenced")); throw new Exception(tl("voiceSilenced"));
} }
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
}
}
User u = getPlayer(server, args[1], true, true); User u = getPlayer(server, args[1], true, true);
if (u == null) { if (u == null) {

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

@ -24,8 +24,13 @@ public class Commandme extends EssentialsCommand {
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception { public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
if (user.isMuted()) { if (user.isMuted()) {
if (user.getMuteReason ().equals ("")) {
throw new Exception(tl("voiceSilenced")); throw new Exception(tl("voiceSilenced"));
} }
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
}
}
if (args.length < 1) { if (args.length < 1) {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();

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

@ -28,8 +28,13 @@ public class Commandr extends EssentialsCommand {
User user = ess.getUser(sender.getPlayer()); User user = ess.getUser(sender.getPlayer());
if (user.isMuted()) { if (user.isMuted()) {
if (user.getMuteReason ().equals ("")) {
throw new Exception(tl("voiceSilenced")); throw new Exception(tl("voiceSilenced"));
} }
else {
throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ()));
}
}
message = FormatUtil.formatMessage(user, "essentials.msg", message); message = FormatUtil.formatMessage(user, "essentials.msg", message);
messageSender = user; messageSender = user;

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

@ -117,8 +117,13 @@ 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()) {
if (user.getMuteReason ().equals ("")) {
sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true")))); 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 ()));
}
}
final String location = user.getGeoLocation(); final String location = user.getGeoLocation();
if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) { if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) {
sender.sendMessage(tl("whoisGeoLocation", location)); sender.sendMessage(tl("whoisGeoLocation", location));

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

@ -56,8 +56,12 @@ 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"))));
if (user.getMuteReason ().equals ("")) {
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false")))); 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 ())));
}
} }
@Override @Override