From 682145eb1349334aaf2f28754b0cea09576cb1ef Mon Sep 17 00:00:00 2001
From: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
Date: Thu, 6 Feb 2020 13:11:07 +1100
Subject: [PATCH] A better way to display the current IP (#186)

a better dev did this
---
 .../java/me/totalfreedom/totalfreedommod/banning/Ban.java  | 5 ++---
 .../totalfreedom/totalfreedommod/banning/BanManager.java   | 2 +-
 .../totalfreedommod/command/Command_glist.java             | 7 ++++---
 .../totalfreedom/totalfreedommod/command/Command_gtfo.java | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
index fc470139..4b88657d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
@@ -45,7 +45,6 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     @Getter
     @Setter
     private long expiryUnix = -1;
-    private Player player;
 
     public Ban()
     {
@@ -172,7 +171,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return hasExpiry() && expiryUnix < FUtil.getUnixTime();
     }
 
-    public String bakeKickMessage()
+    public String bakeKickMessage(String ip)
     {
         final StringBuilder message = new StringBuilder(ChatColor.GOLD + "You");
 
@@ -205,7 +204,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         }
 
         message.append("\n").append(ChatColor.RED).append("IP Address: ").append(ChatColor.GOLD)
-                .append(FUtil.getFuzzyIp(Ips.getIp(player)));
+                .append(ip);
 
         return message.toString();
     }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
index 2d628bf4..35c9ac19 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
@@ -246,7 +246,7 @@ public class BanManager extends FreedomService
 
         if (ban != null && !ban.isExpired())
         {
-            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, ban.bakeKickMessage());
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, ban.bakeKickMessage(ip));
         }
     }
 
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java
index 862a9625..cc8b5c4e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java
@@ -8,11 +8,12 @@ import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.pravian.aero.util.Ips;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.ChatColor;
 import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
 
 
@@ -103,7 +104,7 @@ public class Command_glist extends FreedomCommand
 
                 if (player != null)
                 {
-                    player.kickPlayer(playerBan.bakeKickMessage());
+                    player.kickPlayer(playerBan.bakeKickMessage(Ips.getIp(player)));
                 }
 
                 plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.BAN, null));
@@ -148,7 +149,7 @@ public class Command_glist extends FreedomCommand
 
                 if (player != null)
                 {
-                    player.kickPlayer(nameBan.bakeKickMessage());
+                    player.kickPlayer(nameBan.bakeKickMessage(Ips.getIp(player)));
                 }
 
                 return true;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
index 2cfa650a..61b895d9 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
@@ -183,7 +183,7 @@ public class Command_gtfo extends FreedomCommand
         // Kick player and handle others on IP
         if (player != null)
         {
-            player.kickPlayer(ban.bakeKickMessage());
+            player.kickPlayer(ban.bakeKickMessage(Ips.getIp(player)));
             for (Player p : Bukkit.getOnlinePlayers())
             {
                 if (Ips.getIp(p).equals(Ips.getIp(player)))