From 0dd7bc06eba083bf5569703acf9139196c8a9347 Mon Sep 17 00:00:00 2001
From: Video <videogamesm12@gmail.com>
Date: Sun, 11 Sep 2022 06:04:01 -0600
Subject: [PATCH] FS-449

---
 .../totalfreedommod/player/FPlayer.java         | 17 ++++++-----------
 .../totalfreedommod/player/PlayerList.java      |  8 ++++----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
index 002b16f9..ced5a67a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
@@ -16,6 +16,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 public class FPlayer
 {
@@ -26,7 +27,7 @@ public class FPlayer
     private final TotalFreedomMod plugin;
 
     private final String name;
-
+    private final UUID uuid;
     private final String ip;
     //
     private final FreezeData freezeData = new FreezeData(this);
@@ -70,12 +71,13 @@ public class FPlayer
 
     public FPlayer(TotalFreedomMod plugin, Player player)
     {
-        this(plugin, player.getName(), FUtil.getIp(player));
+        this(plugin, player.getUniqueId(), player.getName(), FUtil.getIp(player));
     }
 
-    private FPlayer(TotalFreedomMod plugin, String name, String ip)
+    private FPlayer(TotalFreedomMod plugin, UUID uuid, String name, String ip)
     {
         this.plugin = plugin;
+        this.uuid = uuid;
         this.name = name;
         this.ip = ip;
     }
@@ -94,14 +96,7 @@ public class FPlayer
 
         if (player == null)
         {
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers())
-            {
-                if (FUtil.getIp(onlinePlayer).equals(ip))
-                {
-                    player = onlinePlayer;
-                    break;
-                }
-            }
+            player = Bukkit.getPlayer(uuid);
         }
 
         return player;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
index 6cd3ad0b..b04960c2 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
@@ -17,7 +17,7 @@ import org.bukkit.entity.Player;
 public class PlayerList extends FreedomService
 {
 
-    public final Map<String, FPlayer> playerMap = Maps.newHashMap(); // ip,dataMap
+    public final Map<UUID, FPlayer> playerMap = Maps.newHashMap(); // uuid, dataMap
     public final Map<UUID, PlayerData> dataMap = Maps.newHashMap(); // uuid, data
 
     @Override
@@ -107,14 +107,14 @@ public class PlayerList extends FreedomService
     // May not return null
     public FPlayer getPlayer(Player player)
     {
-        FPlayer tPlayer = playerMap.get(FUtil.getIp(player));
+        FPlayer tPlayer = playerMap.get(player.getUniqueId());
         if (tPlayer != null)
         {
             return tPlayer;
         }
 
         tPlayer = new FPlayer(plugin, player);
-        playerMap.put(FUtil.getIp(player), tPlayer);
+        playerMap.put(player.getUniqueId(), tPlayer);
 
         return tPlayer;
     }
@@ -233,7 +233,7 @@ public class PlayerList extends FreedomService
         return player;
     }
 
-    public Map<String, FPlayer> getPlayerMap()
+    public Map<UUID, FPlayer> getPlayerMap()
     {
         return playerMap;
     }