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

Merge branch 'mute_reason_changes' into final_mute_reason_issue#385

Browse source 
Updating local changes made on mute_reason_changes into the final branch
This commit is contained in:
CreedTheFreak 2017-12-26 17:20:40 -08:00
commit 3444c8b0d6
5 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -73,7 +73,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
godmode = _getGodModeEnabled(); godmode = _getGodModeEnabled();
muted = _getMuted(); muted = _getMuted();
muteTimeout = _getMuteTimeout(); muteTimeout = _getMuteTimeout();
muteReason = _getMuteReason (); muteReason = _getMuteReason();
jailed = _getJailed(); jailed = _getJailed();
jailTimeout = _getJailTimeout(); jailTimeout = _getJailTimeout();
lastLogin = _getLastLogin(); lastLogin = _getLastLogin();
@ -518,27 +518,22 @@ public abstract class UserData extends PlayerExtension implements IConf {
} }
public String getMuteReason() { public String getMuteReason() {
if (muteReason != null) { return muteReason;
return muteReason;
}
else {
return "";
}
} }
public void setMuteReason(String reason) { public void setMuteReason(String reason) {
if (reason.equals("")) { if (reason == null) {
config.removeProperty ("muteReason"); config.removeProperty("muteReason");
muteReason = null; muteReason = null;
} else { } else {
muteReason = reason; muteReason = reason;
config.setProperty ("muteReason", reason); config.setProperty("muteReason", reason);
} }
config.save(); config.save();
} }
public boolean hasMuteReason(){ public boolean hasMuteReason(){
return !getMuteReason().equals(""); return muteReason != null;
} }
private long muteTimeout; private long muteTimeout;

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

@ -54,19 +54,19 @@ public class Commandmute extends EssentialsCommand {
String muteReason; String muteReason;
try { try {
muteTimestamp = DateUtil.parseDateDiff(time, true); muteTimestamp = DateUtil.parseDateDiff(time, true);
muteReason = getFinalArg (args, 2); muteReason = getFinalArg(args, 2);
} catch (Exception e) { } catch (Exception e) {
user.setMuted ((!user.getMuted ())); user.setMuted((!user.getMuted()));
muteReason = getFinalArg (args, 1); muteReason = getFinalArg(args, 1);
} }
user.setMuteReason (muteReason); user.setMuteReason(muteReason.isEmpty() ? null : muteReason);
user.setMuted(true); user.setMuted(true);
} else { } else {
user.setMuted(!user.getMuted()); user.setMuted(!user.getMuted());
if (!user.getMuted ()) { if (!user.getMuted()) {
user.setMuteReason (""); user.setMuteReason(null);
} }
} }
user.setMuteTimeout(muteTimestamp); user.setMuteTimeout(muteTimestamp);
@ -79,7 +79,7 @@ public class Commandmute extends EssentialsCommand {
if (muted) { if (muted) {
if (muteTimestamp > 0) { if (muteTimestamp > 0) {
if (user.getMuteReason ().equals ("")) { if (!user.hasMuteReason()) {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime)); sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime));
user.sendMessage(tl("playerMutedFor", muteTime)); user.sendMessage(tl("playerMutedFor", muteTime));
} else { } else {
@ -87,31 +87,26 @@ public class Commandmute extends EssentialsCommand {
user.sendMessage(tl("playerMutedForReason", muteTime, user.getMuteReason())); user.sendMessage(tl("playerMutedForReason", muteTime, user.getMuteReason()));
} }
} else { } else {
if (user.getMuteReason ().equals ("")) { if (!user.hasMuteReason()) {
sender.sendMessage(tl("mutedPlayer", user.getDisplayName())); sender.sendMessage(tl("mutedPlayer", user.getDisplayName()));
/** Send the player a message, why they were muted **/
user.sendMessage(tl("playerMuted")); user.sendMessage(tl("playerMuted"));
} } else {
else {
sender.sendMessage(tl("mutedPlayerReason", user.getDisplayName(), user.getMuteReason())); sender.sendMessage(tl("mutedPlayerReason", user.getDisplayName(), user.getMuteReason()));
/** Send the player a message, why they were muted **/
user.sendMessage(tl("playerMutedReason", user.getMuteReason())); user.sendMessage(tl("playerMutedReason", user.getMuteReason()));
} }
} }
final String message; final String message;
if (muteTimestamp > 0) { if (muteTimestamp > 0) {
if (user.getMuteReason ().equals ("")) { if (!user.hasMuteReason()) {
message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime); message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime);
} } else {
else { message = tl("muteNotifyForReason", sender.getSender().getName(), user.getName(), muteTime, user.getMuteReason());
message = (tl("muteNotifyForReason", sender.getSender().getName(), user.getName(), muteTime, user.getMuteReason()));
} }
} else { } else {
if (user.getMuteReason ().equals ("")) { if (!user.hasMuteReason()) {
message = tl("muteNotify", sender.getSender().getName(), user.getName()); message = tl("muteNotify", sender.getSender().getName(), user.getName());
} } else {
else { message = tl("muteNotifyReason", sender.getSender().getName(), user.getName(), user.getMuteReason());
message = (tl("muteNotifyReason", sender.getSender().getName(), user.getName(), user.getMuteReason()));
} }
} }
server.getLogger().log(Level.INFO, message); server.getLogger().log(Level.INFO, message);

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

@ -117,8 +117,12 @@ 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()) {
sender.sendMessage(user.hasMuteReason() ? (tl("whoisMutedReason", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true")), user.getMuteReason())) : long muteTimeout = user.getMuteTimeout();
tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true")))); if (!user.hasMuteReason()) {
sender.sendMessage(tl("whoisMuted", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true"))));
} else {
sender.sendMessage(tl("whoisMutedReason", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")), 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"))) {
@ -160,6 +164,15 @@ public class Commandseen extends EssentialsCommand {
} }
} }
if (user.isMuted()) {
long muteTimeout = user.getMuteTimeout();
if (!user.hasMuteReason()) {
sender.sendMessage(tl("whoisMuted", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true"))));
} else {
sender.sendMessage(tl("whoisMutedReason", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")), 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));

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

@ -56,9 +56,14 @@ 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"))));
sender.sendMessage(user.hasMuteReason() ? tl("whoisMutedReason", (user.isMuted() ? user.getMuteTimeout() > 0 ?
DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false")),user.getMuteReason()) : tl("whoisMuted", (user.isMuted() ? long muteTimeout = user.getMuteTimeout();
user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false")))); if (!user.hasMuteReason()) {
sender.sendMessage(tl("whoisMuted", (user.isMuted() ? (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")) : tl("false"))));
} else {
sender.sendMessage(tl("whoisMutedReason", (user.isMuted() ? (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")) : tl("false")),
user.getMuteReason()));
}
} }
@Override @Override