From 5c39b7eabd49bde4afb3ecb3f77e90c0ffbc1831 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Fri, 15 Jun 2018 00:54:07 +0800
Subject: [PATCH] Better reason and expire message

---
 .../akarin/server/core/AkarinGlobalConfig.java |  8 ++++----
 .../java/net/minecraft/server/PlayerList.java  | 18 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java b/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
index 58a806c90..a7e5a09bc 100644
--- a/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
+++ b/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
@@ -232,22 +232,22 @@ public class AkarinGlobalConfig {
     
     public static String 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;
     private static void messageBanReason() {
-        messageBanReason = getString("messages.disconnect.ban-reason", "Reason: ");
+        messageBanReason = getString("messages.disconnect.ban-reason", "\nReason: ");
     }
     
     public static String 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;
     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;
diff --git a/sources/src/main/java/net/minecraft/server/PlayerList.java b/sources/src/main/java/net/minecraft/server/PlayerList.java
index ffdd4e4b6..3c83cf3a4 100644
--- a/sources/src/main/java/net/minecraft/server/PlayerList.java
+++ b/sources/src/main/java/net/minecraft/server/PlayerList.java
@@ -551,11 +551,10 @@ public abstract class PlayerList {
         if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
             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
-            if (gameprofilebanentry.getExpires() != null) {
-                s = s + AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(gameprofilebanentry.getExpires()); // Akarin - modify message
-            }
-
+            s = LocaleI18n.a(AkarinGlobalConfig.messageBan,
+                    gameprofilebanentry.getReason().equals(Akari.EMPTY_STRING) ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanReason + gameprofilebanentry.getReason(),
+                    gameprofilebanentry.getExpires() == null ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(gameprofilebanentry.getExpires())); // Akarin - modify message
+            
             // return s;
             if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
         } else if (!this.isWhitelisted(gameprofile, event)) { // Paper
@@ -564,11 +563,10 @@ public abstract class PlayerList {
         } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
             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
-            if (ipbanentry.getExpires() != null) {
-                s = s + AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(ipbanentry.getExpires()); // Akarin - modify message
-            }
-
+            s = LocaleI18n.a(AkarinGlobalConfig.messageBan,
+                    ipbanentry.getReason().equals(Akari.EMPTY_STRING) ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanReason + ipbanentry.getReason(),
+                    ipbanentry.getExpires() == null ? Akari.EMPTY_STRING : AkarinGlobalConfig.messageBanExpires + PlayerList.g.format(ipbanentry.getExpires())); // Akarin - modify message
+            
             // return s;
             event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
         } else {