mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-06-29 03:36:42 +00:00
Removal of Lombok
Lombok implementation removal. I have also gone through and replaced things with inline methods and variables, lambdas, and simplified loops down, removed unnecessary guard clauses, and overall cleaned up every single class. This took a long time, please do remember to follow proper naming conventions, don't include unnecessary guard clauses, follow exception rules and comment rules, and please PLEASE remember to use the DIAMOND OPERATOR rather than just inferring RAW TYPES!!! Thank you!!
This commit is contained in:
Paldiu
@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod.player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||
import me.totalfreedom.totalfreedommod.caging.CageData;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
@ -20,37 +18,32 @@ import org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
public class FPlayer
|
||||
{
|
||||
|
||||
public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L;
|
||||
|
||||
@Getter
|
||||
|
||||
private final TotalFreedomMod plugin;
|
||||
@Getter
|
||||
|
||||
private final String name;
|
||||
@Getter
|
||||
|
||||
private final String ip;
|
||||
//
|
||||
@Setter
|
||||
private final FreezeData freezeData = new FreezeData(this);
|
||||
private final CageData cageData = new CageData(this);
|
||||
private final List<LivingEntity> mobThrowerQueue = new ArrayList<>();
|
||||
private Player player;
|
||||
//
|
||||
private BukkitTask unmuteTask;
|
||||
@Getter
|
||||
private final FreezeData freezeData = new FreezeData(this);
|
||||
@Getter
|
||||
private double fuckoffRadius = 0;
|
||||
private int messageCount = 0;
|
||||
private int totalBlockDestroy = 0;
|
||||
private int totalBlockPlace = 0;
|
||||
private int freecamDestroyCount = 0;
|
||||
private int freecamPlaceCount = 0;
|
||||
@Getter
|
||||
private final CageData cageData = new CageData(this);
|
||||
private boolean isOrbiting = false;
|
||||
private double orbitStrength = 10.0;
|
||||
private boolean mobThrowerEnabled = false;
|
||||
private EntityType mobThrowerEntity = EntityType.PIG;
|
||||
private double mobThrowerSpeed = 4.0;
|
||||
private final List<LivingEntity> mobThrowerQueue = new ArrayList<>();
|
||||
private BukkitTask mp44ScheduleTask = null;
|
||||
private boolean mp44Armed = false;
|
||||
private boolean mp44Firing = false;
|
||||
@ -59,21 +52,21 @@ public class FPlayer
|
||||
private String lastMessage = "";
|
||||
private boolean inAdminchat = false;
|
||||
private boolean allCommandsBlocked = false;
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private boolean superadminIdVerified = false;
|
||||
private String lastCommand = "";
|
||||
private boolean cmdspyEnabled = false;
|
||||
private String tag = null;
|
||||
private int warningCount = 0;
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private boolean editBlocked = false;
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private boolean pvpBlocked = false;
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private boolean invSee = false;
|
||||
|
||||
public FPlayer(TotalFreedomMod plugin, Player player)
|
||||
@ -88,6 +81,11 @@ public class FPlayer
|
||||
this.ip = ip;
|
||||
}
|
||||
|
||||
public static long getAutoPurgeTicks()
|
||||
{
|
||||
return AUTO_PURGE_TICKS;
|
||||
}
|
||||
|
||||
public Player getPlayer()
|
||||
{
|
||||
if (player != null && !player.isOnline())
|
||||
@ -110,11 +108,21 @@ public class FPlayer
|
||||
return player;
|
||||
}
|
||||
|
||||
public void setPlayer(Player player)
|
||||
{
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public boolean isOrbiting()
|
||||
{
|
||||
return isOrbiting;
|
||||
}
|
||||
|
||||
public void setOrbiting(boolean orbiting)
|
||||
{
|
||||
isOrbiting = orbiting;
|
||||
}
|
||||
|
||||
public void startOrbiting(double strength)
|
||||
{
|
||||
this.isOrbiting = true;
|
||||
@ -299,6 +307,7 @@ public class FPlayer
|
||||
|
||||
plugin.mu.MUTED_PLAYERS.add(getPlayer().getName());
|
||||
|
||||
// TODO: Simplify this into a Consumer<BukkitTask> lambda?
|
||||
unmuteTask = new BukkitRunnable()
|
||||
{
|
||||
@Override
|
||||
@ -338,16 +347,16 @@ public class FPlayer
|
||||
this.lockedUp = lockedUp;
|
||||
}
|
||||
|
||||
public void setLastMessage(String message)
|
||||
{
|
||||
this.lastMessage = message;
|
||||
}
|
||||
|
||||
public String getLastMessage()
|
||||
{
|
||||
return lastMessage;
|
||||
}
|
||||
|
||||
public void setLastMessage(String message)
|
||||
{
|
||||
this.lastMessage = message;
|
||||
}
|
||||
|
||||
public void setAdminChat(boolean inAdminchat)
|
||||
{
|
||||
this.inAdminchat = inAdminchat;
|
||||
@ -388,6 +397,11 @@ public class FPlayer
|
||||
return cmdspyEnabled;
|
||||
}
|
||||
|
||||
public String getTag()
|
||||
{
|
||||
return this.tag;
|
||||
}
|
||||
|
||||
public void setTag(String tag)
|
||||
{
|
||||
if (tag == null)
|
||||
@ -400,16 +414,16 @@ public class FPlayer
|
||||
}
|
||||
}
|
||||
|
||||
public String getTag()
|
||||
{
|
||||
return this.tag;
|
||||
}
|
||||
|
||||
public int getWarningCount()
|
||||
{
|
||||
return this.warningCount;
|
||||
}
|
||||
|
||||
public void setWarningCount(int warningCount)
|
||||
{
|
||||
this.warningCount = warningCount;
|
||||
}
|
||||
|
||||
public void incrementWarnings()
|
||||
{
|
||||
this.warningCount++;
|
||||
@ -422,7 +436,257 @@ public class FPlayer
|
||||
}
|
||||
}
|
||||
|
||||
private class ArrowShooter extends BukkitRunnable
|
||||
public TotalFreedomMod getPlugin()
|
||||
{
|
||||
return plugin;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getIp()
|
||||
{
|
||||
return ip;
|
||||
}
|
||||
|
||||
public BukkitTask getUnmuteTask()
|
||||
{
|
||||
return unmuteTask;
|
||||
}
|
||||
|
||||
public void setUnmuteTask(BukkitTask unmuteTask)
|
||||
{
|
||||
this.unmuteTask = unmuteTask;
|
||||
}
|
||||
|
||||
public FreezeData getFreezeData()
|
||||
{
|
||||
return freezeData;
|
||||
}
|
||||
|
||||
public double getFuckoffRadius()
|
||||
{
|
||||
return fuckoffRadius;
|
||||
}
|
||||
|
||||
public void setFuckoffRadius(double fuckoffRadius)
|
||||
{
|
||||
this.fuckoffRadius = fuckoffRadius;
|
||||
}
|
||||
|
||||
public int getMessageCount()
|
||||
{
|
||||
return messageCount;
|
||||
}
|
||||
|
||||
public void setMessageCount(int messageCount)
|
||||
{
|
||||
this.messageCount = messageCount;
|
||||
}
|
||||
|
||||
public int getTotalBlockDestroy()
|
||||
{
|
||||
return totalBlockDestroy;
|
||||
}
|
||||
|
||||
public void setTotalBlockDestroy(int totalBlockDestroy)
|
||||
{
|
||||
this.totalBlockDestroy = totalBlockDestroy;
|
||||
}
|
||||
|
||||
public int getTotalBlockPlace()
|
||||
{
|
||||
return totalBlockPlace;
|
||||
}
|
||||
|
||||
public void setTotalBlockPlace(int totalBlockPlace)
|
||||
{
|
||||
this.totalBlockPlace = totalBlockPlace;
|
||||
}
|
||||
|
||||
public int getFreecamDestroyCount()
|
||||
{
|
||||
return freecamDestroyCount;
|
||||
}
|
||||
|
||||
public void setFreecamDestroyCount(int freecamDestroyCount)
|
||||
{
|
||||
this.freecamDestroyCount = freecamDestroyCount;
|
||||
}
|
||||
|
||||
public int getFreecamPlaceCount()
|
||||
{
|
||||
return freecamPlaceCount;
|
||||
}
|
||||
|
||||
public void setFreecamPlaceCount(int freecamPlaceCount)
|
||||
{
|
||||
this.freecamPlaceCount = freecamPlaceCount;
|
||||
}
|
||||
|
||||
public CageData getCageData()
|
||||
{
|
||||
return cageData;
|
||||
}
|
||||
|
||||
public double getOrbitStrength()
|
||||
{
|
||||
return orbitStrength;
|
||||
}
|
||||
|
||||
public void setOrbitStrength(double orbitStrength)
|
||||
{
|
||||
this.orbitStrength = orbitStrength;
|
||||
}
|
||||
|
||||
public boolean isMobThrowerEnabled()
|
||||
{
|
||||
return mobThrowerEnabled;
|
||||
}
|
||||
|
||||
public void setMobThrowerEnabled(boolean mobThrowerEnabled)
|
||||
{
|
||||
this.mobThrowerEnabled = mobThrowerEnabled;
|
||||
}
|
||||
|
||||
public EntityType getMobThrowerEntity()
|
||||
{
|
||||
return mobThrowerEntity;
|
||||
}
|
||||
|
||||
public void setMobThrowerEntity(EntityType mobThrowerEntity)
|
||||
{
|
||||
this.mobThrowerEntity = mobThrowerEntity;
|
||||
}
|
||||
|
||||
public double getMobThrowerSpeed()
|
||||
{
|
||||
return mobThrowerSpeed;
|
||||
}
|
||||
|
||||
public void setMobThrowerSpeed(double mobThrowerSpeed)
|
||||
{
|
||||
this.mobThrowerSpeed = mobThrowerSpeed;
|
||||
}
|
||||
|
||||
public List<LivingEntity> getMobThrowerQueue()
|
||||
{
|
||||
return mobThrowerQueue;
|
||||
}
|
||||
|
||||
public BukkitTask getMp44ScheduleTask()
|
||||
{
|
||||
return mp44ScheduleTask;
|
||||
}
|
||||
|
||||
public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask)
|
||||
{
|
||||
this.mp44ScheduleTask = mp44ScheduleTask;
|
||||
}
|
||||
|
||||
public boolean isMp44Armed()
|
||||
{
|
||||
return mp44Armed;
|
||||
}
|
||||
|
||||
public void setMp44Armed(boolean mp44Armed)
|
||||
{
|
||||
this.mp44Armed = mp44Armed;
|
||||
}
|
||||
|
||||
public boolean isMp44Firing()
|
||||
{
|
||||
return mp44Firing;
|
||||
}
|
||||
|
||||
public void setMp44Firing(boolean mp44Firing)
|
||||
{
|
||||
this.mp44Firing = mp44Firing;
|
||||
}
|
||||
|
||||
public BukkitTask getLockupScheduleTask()
|
||||
{
|
||||
return lockupScheduleTask;
|
||||
}
|
||||
|
||||
public void setLockupScheduleTask(BukkitTask lockupScheduleTask)
|
||||
{
|
||||
this.lockupScheduleTask = lockupScheduleTask;
|
||||
}
|
||||
|
||||
public boolean isInAdminchat()
|
||||
{
|
||||
return inAdminchat;
|
||||
}
|
||||
|
||||
public void setInAdminchat(boolean inAdminchat)
|
||||
{
|
||||
this.inAdminchat = inAdminchat;
|
||||
}
|
||||
|
||||
public boolean isAllCommandsBlocked()
|
||||
{
|
||||
return allCommandsBlocked;
|
||||
}
|
||||
|
||||
public void setAllCommandsBlocked(boolean allCommandsBlocked)
|
||||
{
|
||||
this.allCommandsBlocked = allCommandsBlocked;
|
||||
}
|
||||
|
||||
public boolean isSuperadminIdVerified()
|
||||
{
|
||||
return superadminIdVerified;
|
||||
}
|
||||
|
||||
public void setSuperadminIdVerified(boolean superadminIdVerified)
|
||||
{
|
||||
this.superadminIdVerified = superadminIdVerified;
|
||||
}
|
||||
|
||||
public boolean isCmdspyEnabled()
|
||||
{
|
||||
return cmdspyEnabled;
|
||||
}
|
||||
|
||||
public void setCmdspyEnabled(boolean cmdspyEnabled)
|
||||
{
|
||||
this.cmdspyEnabled = cmdspyEnabled;
|
||||
}
|
||||
|
||||
public boolean isEditBlocked()
|
||||
{
|
||||
return editBlocked;
|
||||
}
|
||||
|
||||
public void setEditBlocked(boolean editBlocked)
|
||||
{
|
||||
this.editBlocked = editBlocked;
|
||||
}
|
||||
|
||||
public boolean isPvpBlocked()
|
||||
{
|
||||
return pvpBlocked;
|
||||
}
|
||||
|
||||
public void setPvpBlocked(boolean pvpBlocked)
|
||||
{
|
||||
this.pvpBlocked = pvpBlocked;
|
||||
}
|
||||
|
||||
public boolean isInvSee()
|
||||
{
|
||||
return invSee;
|
||||
}
|
||||
|
||||
public void setInvSee(boolean invSee)
|
||||
{
|
||||
this.invSee = invSee;
|
||||
}
|
||||
|
||||
private static class ArrowShooter extends BukkitRunnable
|
||||
{
|
||||
|
||||
private final Player player;
|
||||
|
||||
@ -7,8 +7,7 @@ import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import java.util.Objects;
|
||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||
import me.totalfreedom.totalfreedommod.shop.ShopItem;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
@ -19,38 +18,31 @@ import org.bukkit.entity.Player;
|
||||
|
||||
public class PlayerData
|
||||
{
|
||||
@Getter
|
||||
@Setter
|
||||
private String name;
|
||||
private final List<String> ips = Lists.newArrayList();
|
||||
private final List<String> notes = Lists.newArrayList();
|
||||
@Getter
|
||||
@Setter
|
||||
private String tag = null;
|
||||
@Getter
|
||||
@Setter
|
||||
private String discordID = null;
|
||||
private final List<String> backupCodes = Lists.newArrayList();
|
||||
@Setter
|
||||
private String name;
|
||||
private String tag = null;
|
||||
private String discordID = null;
|
||||
private Boolean masterBuilder = false;
|
||||
@Setter
|
||||
|
||||
private Boolean verification = false;
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private String rideMode = "ask";
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private int coins;
|
||||
private List<String> items = Lists.newArrayList();
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private int totalVotes;
|
||||
@Setter
|
||||
|
||||
private boolean displayDiscord = true;
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
|
||||
private String loginMessage;
|
||||
@Setter
|
||||
|
||||
private Boolean inspect = false;
|
||||
|
||||
public PlayerData(ResultSet resultSet)
|
||||
@ -86,41 +78,38 @@ public class PlayerData
|
||||
if (masterBuilder && !verification)
|
||||
{
|
||||
verification = true;
|
||||
TotalFreedomMod.plugin().pl.save(this);
|
||||
Objects.requireNonNull(TotalFreedomMod.plugin()).pl.save(this);
|
||||
}
|
||||
else if (!masterBuilder && discordID == null && verification)
|
||||
{
|
||||
this.verification = false;
|
||||
TotalFreedomMod.plugin().pl.save(this);
|
||||
Objects.requireNonNull(TotalFreedomMod.plugin()).pl.save(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
final StringBuilder output = new StringBuilder();
|
||||
|
||||
output.append("Player: ").append(name).append("\n")
|
||||
.append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
|
||||
.append("- Discord ID: ").append(discordID).append("\n")
|
||||
.append("- Master Builder: ").append(masterBuilder).append("\n")
|
||||
.append("- Has Verification: ").append(verification).append("\n")
|
||||
.append("- Coins: ").append(coins).append("\n")
|
||||
.append("- Total Votes: ").append(totalVotes).append("\n")
|
||||
.append("- Display Discord: ").append(displayDiscord).append("\n")
|
||||
.append("- Tag: ").append(FUtil.colorize(tag)).append(ChatColor.GRAY).append("\n")
|
||||
.append("- Ride Mode: ").append(rideMode).append("\n")
|
||||
.append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n")
|
||||
.append("- Login Message: ").append(loginMessage);
|
||||
|
||||
return output.toString();
|
||||
}
|
||||
|
||||
public PlayerData(Player player)
|
||||
{
|
||||
this.name = player.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
|
||||
return "Player: " + name + "\n" +
|
||||
"- IPs: " + StringUtils.join(ips, ", ") + "\n" +
|
||||
"- Discord ID: " + discordID + "\n" +
|
||||
"- Master Builder: " + masterBuilder + "\n" +
|
||||
"- Has Verification: " + verification + "\n" +
|
||||
"- Coins: " + coins + "\n" +
|
||||
"- Total Votes: " + totalVotes + "\n" +
|
||||
"- Display Discord: " + displayDiscord + "\n" +
|
||||
"- Tag: " + FUtil.colorize(tag) + ChatColor.GRAY + "\n" +
|
||||
"- Ride Mode: " + rideMode + "\n" +
|
||||
"- Backup Codes: " + backupCodes.size() + "/10" + "\n" +
|
||||
"- Login Message: " + loginMessage;
|
||||
}
|
||||
|
||||
public List<String> getIps()
|
||||
{
|
||||
return Collections.unmodifiableList(ips);
|
||||
@ -133,7 +122,12 @@ public class PlayerData
|
||||
|
||||
public boolean addIp(String ip)
|
||||
{
|
||||
return !ips.contains(ip) && ips.add(ip);
|
||||
if (ips.contains(ip))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
ips.add(ip);
|
||||
return true;
|
||||
}
|
||||
|
||||
public void removeIp(String ip)
|
||||
@ -148,7 +142,7 @@ public class PlayerData
|
||||
|
||||
public void addIps(List<String> ips)
|
||||
{
|
||||
ips.addAll(ips);
|
||||
this.ips.addAll(ips);
|
||||
}
|
||||
|
||||
public List<String> getNotes()
|
||||
@ -205,13 +199,14 @@ public class PlayerData
|
||||
return Collections.unmodifiableList(items);
|
||||
}
|
||||
|
||||
public void setItems(List<String> items)
|
||||
{
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
public boolean hasItem(ShopItem item)
|
||||
{
|
||||
if (items.contains(item.getDataName()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return items.contains(item.getDataName());
|
||||
}
|
||||
|
||||
public void removeItem(ShopItem item)
|
||||
@ -236,7 +231,7 @@ public class PlayerData
|
||||
|
||||
public Map<String, Object> toSQLStorable()
|
||||
{
|
||||
Map<String, Object> map = new HashMap<String, Object>()
|
||||
return new HashMap<String, Object>()
|
||||
{{
|
||||
put("username", name);
|
||||
put("ips", FUtil.listToString(ips));
|
||||
@ -254,11 +249,120 @@ public class PlayerData
|
||||
put("login_message", loginMessage);
|
||||
put("inspect", inspect);
|
||||
}};
|
||||
return map;
|
||||
}
|
||||
|
||||
public boolean doesDisplayDiscord()
|
||||
{
|
||||
return displayDiscord;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getTag()
|
||||
{
|
||||
return tag;
|
||||
}
|
||||
|
||||
public void setTag(String tag)
|
||||
{
|
||||
this.tag = tag;
|
||||
}
|
||||
|
||||
public String getDiscordID()
|
||||
{
|
||||
return discordID;
|
||||
}
|
||||
|
||||
public void setDiscordID(String discordID)
|
||||
{
|
||||
this.discordID = discordID;
|
||||
}
|
||||
|
||||
public Boolean getMasterBuilder()
|
||||
{
|
||||
return masterBuilder;
|
||||
}
|
||||
|
||||
public void setMasterBuilder(Boolean masterBuilder)
|
||||
{
|
||||
this.masterBuilder = masterBuilder;
|
||||
}
|
||||
|
||||
public Boolean getVerification()
|
||||
{
|
||||
return verification;
|
||||
}
|
||||
|
||||
public void setVerification(Boolean verification)
|
||||
{
|
||||
this.verification = verification;
|
||||
}
|
||||
|
||||
public String getRideMode()
|
||||
{
|
||||
return rideMode;
|
||||
}
|
||||
|
||||
public void setRideMode(String rideMode)
|
||||
{
|
||||
this.rideMode = rideMode;
|
||||
}
|
||||
|
||||
public int getCoins()
|
||||
{
|
||||
return coins;
|
||||
}
|
||||
|
||||
public void setCoins(int coins)
|
||||
{
|
||||
this.coins = coins;
|
||||
}
|
||||
|
||||
public int getTotalVotes()
|
||||
{
|
||||
return totalVotes;
|
||||
}
|
||||
|
||||
public void setTotalVotes(int totalVotes)
|
||||
{
|
||||
this.totalVotes = totalVotes;
|
||||
}
|
||||
|
||||
public boolean isDisplayDiscord()
|
||||
{
|
||||
return displayDiscord;
|
||||
}
|
||||
|
||||
public void setDisplayDiscord(boolean displayDiscord)
|
||||
{
|
||||
this.displayDiscord = displayDiscord;
|
||||
}
|
||||
|
||||
public String getLoginMessage()
|
||||
{
|
||||
return loginMessage;
|
||||
}
|
||||
|
||||
public void setLoginMessage(String loginMessage)
|
||||
{
|
||||
this.loginMessage = loginMessage;
|
||||
}
|
||||
|
||||
public Boolean getInspect()
|
||||
{
|
||||
return inspect;
|
||||
}
|
||||
|
||||
public void setInspect(Boolean inspect)
|
||||
{
|
||||
this.inspect = inspect;
|
||||
}
|
||||
}
|
||||
@ -7,11 +7,12 @@ import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import lombok.Getter;
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
@ -73,7 +74,7 @@ public class PlayerList extends FreedomService
|
||||
{
|
||||
if (player.isOnline())
|
||||
{
|
||||
return FUtil.getIp(player.getPlayer());
|
||||
return FUtil.getIp(Objects.requireNonNull(player.getPlayer()));
|
||||
}
|
||||
|
||||
final PlayerData entry = getData(player.getName());
|
||||
@ -98,25 +99,16 @@ public class PlayerList extends FreedomService
|
||||
{
|
||||
PlayerData data = getData(name);
|
||||
|
||||
if ((!ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) && data != null && !ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName()))
|
||||
return (!ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) && data != null && !ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName()))
|
||||
&& !ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(data.getName())
|
||||
&& !isTelnetMasterBuilder(data)
|
||||
&& !ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
&& !ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase());
|
||||
}
|
||||
|
||||
public boolean isTelnetMasterBuilder(PlayerData playerData)
|
||||
{
|
||||
Admin admin = plugin.al.getEntryByName(playerData.getName());
|
||||
if (admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder();
|
||||
}
|
||||
|
||||
// May not return null
|
||||
@ -262,23 +254,19 @@ public class PlayerList extends FreedomService
|
||||
}
|
||||
|
||||
// Create new data if nonexistent
|
||||
if (playerData == null)
|
||||
{
|
||||
FLog.info("Creating new player verification entry for " + player.getName());
|
||||
FLog.info("Creating new player verification entry for " + player.getName());
|
||||
|
||||
// Create new player
|
||||
playerData = new PlayerData(player);
|
||||
playerData.addIp(FUtil.getIp(player));
|
||||
// Create new player
|
||||
playerData = new PlayerData(player);
|
||||
playerData.addIp(FUtil.getIp(player));
|
||||
|
||||
// Store player
|
||||
dataMap.put(player.getName(), playerData);
|
||||
// Store player
|
||||
dataMap.put(player.getName(), playerData);
|
||||
|
||||
// Save player
|
||||
plugin.sql.addPlayer(playerData);
|
||||
return playerData;
|
||||
}
|
||||
// Save player
|
||||
plugin.sql.addPlayer(playerData);
|
||||
return playerData;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public PlayerData getData(String username)
|
||||
|
||||
Reference in New Issue
Block a user