Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Better reason and expire message

Browse Source
This commit is contained in:
Sotr
2018-06-15 00:54:07 +08:00
parent d8f0674b89
commit 5c39b7eabd
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
View File

@@ -232,22 +232,22 @@ public class AkarinGlobalConfig {
public static String messageBan; public static String messageBan;
private static void messageBan() { private static void messageBan() {
messageBan = getString("messages.disconnect.ban-player-name", "You are banned from this server!"); messageBan = getString("messages.disconnect.ban-player-name", "You are banned from this server! %s %s");
} }
public static String messageBanReason; public static String messageBanReason;
private static void messageBanReason() { private static void messageBanReason() {
messageBanReason = getString("messages.disconnect.ban-reason", "Reason: "); messageBanReason = getString("messages.disconnect.ban-reason", "\nReason: ");
} }
public static String messageBanExpires; public static String messageBanExpires;
private static void messageBanExpires() { private static void messageBanExpires() {
messageBanExpires = getString("messages.disconnect.ban-expires", "Your ban will be removed on "); messageBanExpires = getString("messages.disconnect.ban-expires", "\nYour ban will be removed on ");
} }
public static String messageBanIp; public static String messageBanIp;
private static void messageBanIp() { private static void messageBanIp() {
messageBanIp = getString("messages.disconnect.ban-player-ip", "Your IP address is banned from this server!"); messageBanIp = getString("messages.disconnect.ban-player-ip", "Your IP address is banned from this server! %s %s");
} }
public static String messageDupLogin; public static String messageDupLogin;

18
sources/src/main/java/net/minecraft/server/PlayerList.java
View File

@@ -551,11 +551,10 @@ public abstract class PlayerList {
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) { if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = this.k.get(gameprofile); GameProfileBanEntry gameprofilebanentry = this.k.get(gameprofile);
s = AkarinGlobalConfig.messageBan + (gameprofilebanentry.getReason().equals(Akari.EMPTY_STRING) ? Akari.EMPTY_STRING : (AkarinGlobalConfig.messageBan + "\n" + gameprofilebanentry.getReason())); // Akarin - modify message s = LocaleI18n.a(AkarinGlobalConfig.messageBan,
if (gameprofilebanentry.getExpires() != null) { gameprofilebanentry.getReason().equals(Akari.EMPTY_STRING) ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanReason + gameprofilebanentry.getReason(),
s = s + AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(gameprofilebanentry.getExpires()); // Akarin - modify message gameprofilebanentry.getExpires() == null ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(gameprofilebanentry.getExpires())); // Akarin - modify message
}
// return s; // return s;
if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
} else if (!this.isWhitelisted(gameprofile, event)) { // Paper } else if (!this.isWhitelisted(gameprofile, event)) { // Paper
@@ -564,11 +563,10 @@ public abstract class PlayerList {
} else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) { } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
IpBanEntry ipbanentry = this.l.get(socketaddress); IpBanEntry ipbanentry = this.l.get(socketaddress);
s = AkarinGlobalConfig.messageBanIp + (ipbanentry.getReason().equals(Akari.EMPTY_STRING) ? Akari.EMPTY_STRING : (AkarinGlobalConfig.messageBanReason + "\n" + ipbanentry.getReason())); // Akarin - modify message s = LocaleI18n.a(AkarinGlobalConfig.messageBan,
if (ipbanentry.getExpires() != null) { ipbanentry.getReason().equals(Akari.EMPTY_STRING) ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanReason + ipbanentry.getReason(),
s = s + AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(ipbanentry.getExpires()); // Akarin - modify message ipbanentry.getExpires() == null ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(ipbanentry.getExpires())); // Akarin - modify message
}
// return s; // return s;
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
} else { } else {