AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-26 17:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262 from AtlasMediaGroup/FS-449

Browse Source 
Stabilization Part 4 - The Lost Episode (Remastered) [FS-449]
This commit is contained in:
Video 2022-09-11 11:30:21 -06:00 committed by GitHub
commit a8665a15d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
View File

@ -16,6 +16,7 @@ import org.bukkit.scheduler.BukkitTask;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
public class FPlayer public class FPlayer
{ {
@ -26,7 +27,7 @@ public class FPlayer
private final TotalFreedomMod plugin; private final TotalFreedomMod plugin;
private final String name; private final String name;
private final UUID uuid;
private final String ip; private final String ip;
// //
private final FreezeData freezeData = new FreezeData(this); private final FreezeData freezeData = new FreezeData(this);
@ -70,12 +71,13 @@ public class FPlayer
public FPlayer(TotalFreedomMod plugin, Player player) 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.plugin = plugin;
this.uuid = uuid;
this.name = name; this.name = name;
this.ip = ip; this.ip = ip;
} }
@ -94,14 +96,7 @@ public class FPlayer
if (player == null) if (player == null)
{ {
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) player = Bukkit.getPlayer(uuid);
{
if (FUtil.getIp(onlinePlayer).equals(ip))
{
player = onlinePlayer;
break;
}
}
} }
return player; return player;

8
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
View File

@ -17,7 +17,7 @@ import org.bukkit.entity.Player;
public class PlayerList extends FreedomService 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 public final Map<UUID, PlayerData> dataMap = Maps.newHashMap(); // uuid, data
@Override @Override
@ -107,14 +107,14 @@ public class PlayerList extends FreedomService
// May not return null // May not return null
public FPlayer getPlayer(Player player) public FPlayer getPlayer(Player player)
{ {
FPlayer tPlayer = playerMap.get(FUtil.getIp(player)); FPlayer tPlayer = playerMap.get(player.getUniqueId());
if (tPlayer != null) if (tPlayer != null)
{ {
return tPlayer; return tPlayer;
} }
tPlayer = new FPlayer(plugin, player); tPlayer = new FPlayer(plugin, player);
playerMap.put(FUtil.getIp(player), tPlayer); playerMap.put(player.getUniqueId(), tPlayer);
return tPlayer; return tPlayer;
} }
@ -233,7 +233,7 @@ public class PlayerList extends FreedomService
return player; return player;
} }
public Map<String, FPlayer> getPlayerMap() public Map<UUID, FPlayer> getPlayerMap()
{ {
return playerMap; return playerMap;
} }