mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-07-01 04:26:42 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 618d5c5ecb |
18
pom.xml
18
pom.xml
@ -14,8 +14,6 @@
|
||||
<jar.finalName>${project.name}</jar.finalName>
|
||||
<timestamp>${maven.build.timestamp}</timestamp>
|
||||
<maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
|
||||
|
||||
<tfguilds.version>master-4ec00d977c-1</tfguilds.version>
|
||||
</properties>
|
||||
|
||||
<name>TotalFreedomMod</name>
|
||||
@ -244,7 +242,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.AtlasMediaGroup</groupId>
|
||||
<artifactId>TFGuilds</artifactId>
|
||||
<version>${tfguilds.version}</version>
|
||||
<version>master-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
@ -272,18 +270,6 @@
|
||||
<artifactId>org.eclipse.sisu.inject</artifactId>
|
||||
<version>0.3.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents.client5</groupId>
|
||||
<artifactId>httpclient5</artifactId>
|
||||
<version>5.0.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
<version>20210307</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -460,8 +446,6 @@
|
||||
<include>com.github.speedxx:Mojangson</include>
|
||||
<include>org.bstats:bstats-bukkit</include>
|
||||
<include>org.jetbrains:annotations</include>
|
||||
<includes>org.apache.httpcomponents.client5:httpclient5</includes>
|
||||
<includes>org.apache.httpcomponents.core5:httpcore5</includes>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
</configuration>
|
||||
|
||||
@ -126,7 +126,7 @@ public class ChatManager extends FreedomService
|
||||
boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
|
||||
for (Player p : server.getOnlinePlayers())
|
||||
{
|
||||
if ((ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone) && !event.isCancelled())
|
||||
if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
|
||||
{
|
||||
p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
|
||||
}
|
||||
|
||||
@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.player.FPlayer;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
@ -20,7 +18,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
|
||||
public class Muter extends FreedomService
|
||||
{
|
||||
|
||||
public final List<UUID> MUTED_PLAYERS = new ArrayList<>();
|
||||
public final List<String> MUTED_PLAYERS = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public void onStart()
|
||||
@ -47,7 +45,7 @@ public class Muter extends FreedomService
|
||||
if (plugin.al.isAdminSync(player))
|
||||
{
|
||||
fPlayer.setMuted(false);
|
||||
MUTED_PLAYERS.remove(player.getUniqueId());
|
||||
MUTED_PLAYERS.remove(player.getName());
|
||||
return;
|
||||
}
|
||||
|
||||
@ -107,7 +105,7 @@ public class Muter extends FreedomService
|
||||
Player player = event.getPlayer();
|
||||
FPlayer playerdata = plugin.pl.getPlayer(player);
|
||||
|
||||
if (MUTED_PLAYERS.contains(player.getUniqueId()))
|
||||
if (MUTED_PLAYERS.contains(player.getName()))
|
||||
{
|
||||
playerdata.setMuted(true);
|
||||
}
|
||||
|
||||
@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod.admin;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.config.YamlConfig;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
@ -16,14 +14,13 @@ import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
//TODO: convert to uuids
|
||||
public class ActivityLog extends FreedomService
|
||||
{
|
||||
|
||||
public static final String FILENAME = "activitylog.yml";
|
||||
|
||||
private final Map<UUID, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
|
||||
private final Map<UUID, ActivityLogEntry> activityLogs = Maps.newHashMap();
|
||||
private final Map<String, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
|
||||
private final Map<String, ActivityLogEntry> nameTable = Maps.newHashMap();
|
||||
private final Map<String, ActivityLogEntry> ipTable = Maps.newHashMap();
|
||||
|
||||
private final YamlConfig config;
|
||||
@ -55,7 +52,7 @@ public class ActivityLog extends FreedomService
|
||||
config.load();
|
||||
|
||||
allActivityLogs.clear();
|
||||
activityLogs.clear();
|
||||
nameTable.clear();
|
||||
ipTable.clear();
|
||||
for (String key : config.getKeys(false))
|
||||
{
|
||||
@ -75,7 +72,7 @@ public class ActivityLog extends FreedomService
|
||||
continue;
|
||||
}
|
||||
|
||||
allActivityLogs.put(UUID.fromString(key), activityLogEntry);
|
||||
allActivityLogs.put(key, activityLogEntry);
|
||||
}
|
||||
|
||||
updateTables();
|
||||
@ -105,12 +102,12 @@ public class ActivityLog extends FreedomService
|
||||
return getActivityLog((Player)sender);
|
||||
}
|
||||
|
||||
return getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
|
||||
return getEntryByName(sender.getName());
|
||||
}
|
||||
|
||||
public ActivityLogEntry getActivityLog(Player player)
|
||||
{
|
||||
ActivityLogEntry activityLog = getEntryByUUID(player.getUniqueId());
|
||||
ActivityLogEntry activityLog = getEntryByName(player.getName());
|
||||
if (activityLog == null)
|
||||
{
|
||||
String ip = FUtil.getIp(player);
|
||||
@ -118,13 +115,14 @@ public class ActivityLog extends FreedomService
|
||||
if (activityLog != null)
|
||||
{
|
||||
// Set the new username
|
||||
activityLog.setName(player.getName());
|
||||
save();
|
||||
updateTables();
|
||||
}
|
||||
else
|
||||
{
|
||||
activityLog = new ActivityLogEntry(player);
|
||||
allActivityLogs.put(activityLog.getUUID(), activityLog);
|
||||
allActivityLogs.put(activityLog.getConfigKey(), activityLog);
|
||||
updateTables();
|
||||
|
||||
activityLog.saveTo(config.createSection(activityLog.getConfigKey()));
|
||||
@ -141,9 +139,9 @@ public class ActivityLog extends FreedomService
|
||||
return activityLog;
|
||||
}
|
||||
|
||||
public ActivityLogEntry getEntryByUUID(UUID uuid)
|
||||
public ActivityLogEntry getEntryByName(String name)
|
||||
{
|
||||
return activityLogs.get(uuid);
|
||||
return nameTable.get(name.toLowerCase());
|
||||
}
|
||||
|
||||
public ActivityLogEntry getEntryByIp(String ip)
|
||||
@ -153,12 +151,12 @@ public class ActivityLog extends FreedomService
|
||||
|
||||
public void updateTables()
|
||||
{
|
||||
activityLogs.clear();
|
||||
nameTable.clear();
|
||||
ipTable.clear();
|
||||
|
||||
for (ActivityLogEntry activityLog : allActivityLogs.values())
|
||||
{
|
||||
activityLogs.put(activityLog.getUUID(), activityLog);
|
||||
nameTable.put(activityLog.getName().toLowerCase(), activityLog);
|
||||
|
||||
for (String ip : activityLog.getIps())
|
||||
{
|
||||
@ -192,14 +190,14 @@ public class ActivityLog extends FreedomService
|
||||
}
|
||||
}
|
||||
|
||||
public Map<UUID, ActivityLogEntry> getAllActivityLogs()
|
||||
public Map<String, ActivityLogEntry> getAllActivityLogs()
|
||||
{
|
||||
return allActivityLogs;
|
||||
}
|
||||
|
||||
public Map<UUID, ActivityLogEntry> getActivityLogs()
|
||||
public Map<String, ActivityLogEntry> getNameTable()
|
||||
{
|
||||
return activityLogs;
|
||||
return nameTable;
|
||||
}
|
||||
|
||||
public Map<String, ActivityLogEntry> getIpTable()
|
||||
|
||||
@ -4,8 +4,6 @@ import com.google.common.collect.Lists;
|
||||
import java.time.Instant;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.config.IConfig;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.apache.commons.lang.Validate;
|
||||
@ -20,20 +18,17 @@ public class ActivityLogEntry implements IConfig
|
||||
private final List<String> timestamps = Lists.newArrayList();
|
||||
private final List<String> durations = Lists.newArrayList();
|
||||
private String configKey;
|
||||
private String name;
|
||||
|
||||
public ActivityLogEntry(Player player)
|
||||
{
|
||||
this.configKey = player.getUniqueId().toString();
|
||||
this.configKey = player.getName().toLowerCase();
|
||||
this.name = player.getName();
|
||||
}
|
||||
|
||||
public ActivityLogEntry(UUID uuid)
|
||||
public ActivityLogEntry(String configKey)
|
||||
{
|
||||
this.configKey = uuid.toString();
|
||||
}
|
||||
|
||||
public ActivityLogEntry(String uuid)
|
||||
{
|
||||
this.configKey = uuid;
|
||||
this.configKey = configKey;
|
||||
}
|
||||
|
||||
public static String getFILENAME()
|
||||
@ -44,11 +39,13 @@ public class ActivityLogEntry implements IConfig
|
||||
public void loadFrom(Player player)
|
||||
{
|
||||
configKey = player.getName().toLowerCase();
|
||||
name = player.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadFrom(ConfigurationSection cs)
|
||||
{
|
||||
name = cs.getString("username", configKey);
|
||||
ips.clear();
|
||||
ips.addAll(cs.getStringList("ips"));
|
||||
timestamps.clear();
|
||||
@ -60,8 +57,8 @@ public class ActivityLogEntry implements IConfig
|
||||
@Override
|
||||
public void saveTo(ConfigurationSection cs)
|
||||
{
|
||||
Validate.isTrue(isValid(), "Could not save activity entry: " + getUUID() + ". Entry not valid!");
|
||||
cs.set("uuid", getUUID().toString());
|
||||
Validate.isTrue(isValid(), "Could not save activity entry: " + name + ". Entry not valid!");
|
||||
cs.set("username", name);
|
||||
cs.set("ips", Lists.newArrayList(ips));
|
||||
cs.set("timestamps", Lists.newArrayList(timestamps));
|
||||
cs.set("durations", Lists.newArrayList(durations));
|
||||
@ -76,11 +73,11 @@ public class ActivityLogEntry implements IConfig
|
||||
public void addLogout()
|
||||
{
|
||||
// Fix of Array index out of bonds issue: FS-131
|
||||
String lastLoginString = "";
|
||||
String lastLoginString;
|
||||
if(timestamps.size() > 1)
|
||||
{
|
||||
lastLoginString = timestamps.get(timestamps.size() - 1);
|
||||
} else if (timestamps.size() == 1)
|
||||
}else
|
||||
{
|
||||
lastLoginString = timestamps.get(0);
|
||||
}
|
||||
@ -139,7 +136,7 @@ public class ActivityLogEntry implements IConfig
|
||||
public boolean isValid()
|
||||
{
|
||||
return configKey != null
|
||||
&& getUUID() != null;
|
||||
&& name != null;
|
||||
}
|
||||
|
||||
public String getConfigKey()
|
||||
@ -152,6 +149,16 @@ public class ActivityLogEntry implements IConfig
|
||||
this.configKey = configKey;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public List<String> getIps()
|
||||
{
|
||||
return ips;
|
||||
@ -166,12 +173,4 @@ public class ActivityLogEntry implements IConfig
|
||||
{
|
||||
return durations;
|
||||
}
|
||||
|
||||
public UUID getUUID() {
|
||||
return UUID.fromString(configKey);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return FUtil.getNameFromUUID(getUUID());
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,11 @@ package me.totalfreedom.totalfreedommod.admin;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
|
||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
@ -18,7 +21,7 @@ public class Admin
|
||||
|
||||
|
||||
private final List<String> ips = new ArrayList<>();
|
||||
private UUID uuid;
|
||||
private String name;
|
||||
private boolean active = true;
|
||||
private Rank rank = Rank.ADMIN;
|
||||
private Date lastLogin = new Date();
|
||||
@ -29,7 +32,7 @@ public class Admin
|
||||
|
||||
public Admin(Player player)
|
||||
{
|
||||
this.uuid = player.getUniqueId();
|
||||
this.name = player.getName();
|
||||
this.ips.add(FUtil.getIp(player));
|
||||
}
|
||||
|
||||
@ -37,7 +40,7 @@ public class Admin
|
||||
{
|
||||
try
|
||||
{
|
||||
this.uuid = UUID.fromString(resultSet.getString("uuid"));
|
||||
this.name = resultSet.getString("username");
|
||||
this.active = resultSet.getBoolean("active");
|
||||
this.rank = Rank.findRank(resultSet.getString("rank"));
|
||||
this.ips.clear();
|
||||
@ -59,7 +62,7 @@ public class Admin
|
||||
{
|
||||
final StringBuilder output = new StringBuilder();
|
||||
|
||||
output.append("Admin: ").append(uuid.toString()).append("\n")
|
||||
output.append("Admin: ").append(name).append("\n")
|
||||
.append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
|
||||
.append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
|
||||
.append("- Rank: ").append(rank.getName()).append("\n")
|
||||
@ -75,7 +78,7 @@ public class Admin
|
||||
{
|
||||
Map<String, Object> map = new HashMap<String, Object>()
|
||||
{{
|
||||
put("uuid", uuid.toString());
|
||||
put("username", name);
|
||||
put("active", active);
|
||||
put("rank", rank.toString());
|
||||
put("ips", FUtil.listToString(ips));
|
||||
@ -117,20 +120,20 @@ public class Admin
|
||||
|
||||
public boolean isValid()
|
||||
{
|
||||
return uuid != null
|
||||
return name != null
|
||||
&& rank != null
|
||||
&& !ips.isEmpty()
|
||||
&& lastLogin != null;
|
||||
}
|
||||
|
||||
public UUID getUniqueId()
|
||||
public String getName()
|
||||
{
|
||||
return uuid;
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setUniqueId(UUID uuid)
|
||||
public void setName(String name)
|
||||
{
|
||||
this.uuid = uuid;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public boolean isActive()
|
||||
@ -165,7 +168,6 @@ public class Admin
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public Rank getRank()
|
||||
{
|
||||
return rank;
|
||||
@ -230,9 +232,4 @@ public class Admin
|
||||
{
|
||||
this.pteroID = pteroID;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return FUtil.getNameFromUUID(uuid);
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,11 @@ import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
@ -22,7 +26,7 @@ public class AdminList extends FreedomService
|
||||
private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
|
||||
// Only active admins below
|
||||
private final Set<Admin> activeAdmins = Sets.newHashSet();
|
||||
private final Map<UUID, Admin> adminTable = Maps.newHashMap();
|
||||
private final Map<String, Admin> nameTable = Maps.newHashMap();
|
||||
private final Map<String, Admin> ipTable = Maps.newHashMap();
|
||||
|
||||
public static List<String> getVanished()
|
||||
@ -62,7 +66,7 @@ public class AdminList extends FreedomService
|
||||
}
|
||||
|
||||
updateTables();
|
||||
FLog.info("Loaded " + allAdmins.size() + " admins (" + adminTable.size() + " active, " + ipTable.size() + " IPs)");
|
||||
FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active, " + ipTable.size() + " IPs)");
|
||||
}
|
||||
|
||||
public void messageAllAdmins(String message)
|
||||
@ -93,16 +97,14 @@ public class AdminList extends FreedomService
|
||||
return isAdmin(sender);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public List<String> getActiveAdminNames()
|
||||
{
|
||||
/*List<String> names = new ArrayList();
|
||||
List<String> names = new ArrayList();
|
||||
for (Admin admin : activeAdmins)
|
||||
{
|
||||
names.add(admin.getName());
|
||||
}
|
||||
return names;*/
|
||||
throw new UnsupportedOperationException("Admin no longer stores names in the object, may be changed in a future update");
|
||||
return names;
|
||||
}
|
||||
|
||||
public boolean isAdmin(CommandSender sender)
|
||||
@ -140,21 +142,21 @@ public class AdminList extends FreedomService
|
||||
return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
|
||||
}
|
||||
|
||||
public Admin getAdmin(CommandSender sender) //TODO: Fix
|
||||
public Admin getAdmin(CommandSender sender)
|
||||
{
|
||||
if (sender instanceof Player)
|
||||
{
|
||||
return getAdmin((Player)sender);
|
||||
}
|
||||
|
||||
return getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
|
||||
return getEntryByName(sender.getName());
|
||||
}
|
||||
|
||||
public Admin getAdmin(Player player)
|
||||
{
|
||||
// Find admin
|
||||
String ip = FUtil.getIp(player);
|
||||
Admin admin = getEntryByUUID(player.getUniqueId());
|
||||
Admin admin = getEntryByName(player.getName());
|
||||
|
||||
// Admin by name
|
||||
if (admin != null)
|
||||
@ -179,16 +181,18 @@ public class AdminList extends FreedomService
|
||||
if (admin != null)
|
||||
{
|
||||
// Set the new username
|
||||
//plugin.sql.updateAdminName(oldName, admin.getName());
|
||||
String oldName = admin.getName();
|
||||
admin.setName(player.getName());
|
||||
plugin.sql.updateAdminName(oldName, admin.getName());
|
||||
updateTables();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public Admin getEntryByUUID(UUID uuid)
|
||||
public Admin getEntryByName(String name)
|
||||
{
|
||||
return adminTable.get(uuid);
|
||||
return nameTable.get(name.toLowerCase());
|
||||
}
|
||||
|
||||
public Admin getEntryByIp(String ip)
|
||||
@ -196,7 +200,6 @@ public class AdminList extends FreedomService
|
||||
return ipTable.get(ip);
|
||||
}
|
||||
|
||||
@Deprecated // TODO: no ips maybe ? idk soontm
|
||||
public Admin getEntryByIpFuzzy(String needleIp)
|
||||
{
|
||||
final Admin directAdmin = getEntryByIp(needleIp);
|
||||
@ -225,12 +228,13 @@ public class AdminList extends FreedomService
|
||||
}
|
||||
|
||||
admin.setLastLogin(new Date());
|
||||
admin.setName(player.getName());
|
||||
save(admin);
|
||||
}
|
||||
|
||||
public boolean isAdminImpostor(Player player)
|
||||
{
|
||||
return getEntryByUUID(player.getUniqueId()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
|
||||
return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
|
||||
}
|
||||
|
||||
public boolean isVerifiedAdmin(Player player)
|
||||
@ -293,7 +297,7 @@ public class AdminList extends FreedomService
|
||||
public void updateTables()
|
||||
{
|
||||
activeAdmins.clear();
|
||||
adminTable.clear();
|
||||
nameTable.clear();
|
||||
ipTable.clear();
|
||||
|
||||
for (Admin admin : allAdmins)
|
||||
@ -304,7 +308,7 @@ public class AdminList extends FreedomService
|
||||
}
|
||||
|
||||
activeAdmins.add(admin);
|
||||
adminTable.put(admin.getUniqueId(), admin);
|
||||
nameTable.put(admin.getName().toLowerCase(), admin);
|
||||
|
||||
for (String ip : admin.getIps())
|
||||
{
|
||||
@ -314,9 +318,9 @@ public class AdminList extends FreedomService
|
||||
}
|
||||
}
|
||||
|
||||
public Set<UUID> getAdminUUIDs()
|
||||
public Set<String> getAdminNames()
|
||||
{
|
||||
return adminTable.keySet();
|
||||
return nameTable.keySet();
|
||||
}
|
||||
|
||||
public Set<String> getAdminIps()
|
||||
@ -328,7 +332,7 @@ public class AdminList extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
ResultSet currentSave = plugin.sql.getAdminByUUID(admin.getUniqueId());
|
||||
ResultSet currentSave = plugin.sql.getAdminByName(admin.getName());
|
||||
for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
|
||||
{
|
||||
Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
|
||||
@ -388,6 +392,11 @@ public class AdminList extends FreedomService
|
||||
return activeAdmins;
|
||||
}
|
||||
|
||||
public Map<String, Admin> getNameTable()
|
||||
{
|
||||
return nameTable;
|
||||
}
|
||||
|
||||
public Map<String, Admin> getIpTable()
|
||||
{
|
||||
return ipTable;
|
||||
|
||||
@ -19,8 +19,6 @@ import org.bukkit.entity.Player;
|
||||
public class Ban
|
||||
{
|
||||
|
||||
//TODO: fuck your usernames and getting by ips, bans will be in uuid maybe soon tm idk
|
||||
|
||||
public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
|
||||
private final List<String> ips = Lists.newArrayList();
|
||||
private String username = null;
|
||||
|
||||
@ -12,7 +12,6 @@ import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
@ -127,7 +126,7 @@ public class BukkitTelnetBridge extends FreedomService
|
||||
{
|
||||
for (ClientSession session : telnet.appender.getSessions())
|
||||
{
|
||||
Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(session.getUserName()));
|
||||
Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase());
|
||||
if (admin != null && !admins.contains(admin))
|
||||
{
|
||||
admins.add(admin);
|
||||
|
||||
@ -65,7 +65,7 @@ public class Command_ban extends FreedomCommand
|
||||
final Player player = getPlayer(args[0]);
|
||||
if (player == null)
|
||||
{
|
||||
final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
final PlayerData entry = plugin.pl.getData(args[0]);
|
||||
|
||||
if (entry == null)
|
||||
{
|
||||
|
||||
@ -67,6 +67,11 @@ public class Command_cage extends FreedomCommand
|
||||
outerMaterial = Material.PLAYER_HEAD;
|
||||
if (args.length >= 3)
|
||||
{
|
||||
if (!args[2].matches("([A-z]*)") || args[2].length() < 3 || args[2].length() > 16)
|
||||
{
|
||||
msg("Invalid name!", ChatColor.RED);
|
||||
return true;
|
||||
}
|
||||
skullName = args[2];
|
||||
}
|
||||
else
|
||||
|
||||
@ -56,7 +56,7 @@ public class Command_doom extends FreedomCommand
|
||||
plugin.ptero.updateAccountStatus(admin);
|
||||
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
|
||||
{
|
||||
Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
|
||||
Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod.command;
|
||||
import me.totalfreedom.totalfreedommod.discord.Discord;
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@ -25,7 +24,7 @@ public class Command_linkdiscord extends FreedomCommand
|
||||
|
||||
if (args.length > 1 && plugin.al.isAdmin(playerSender))
|
||||
{
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
PlayerData playerData = plugin.pl.getData(args[0]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
|
||||
@ -42,7 +42,7 @@ public class Command_manageshop extends FreedomCommand
|
||||
int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
|
||||
if (!args[3].equals("all"))
|
||||
{
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
|
||||
PlayerData playerData = plugin.pl.getData(args[3]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
@ -83,7 +83,7 @@ public class Command_manageshop extends FreedomCommand
|
||||
int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
|
||||
if (!args[3].equals("all"))
|
||||
{
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
|
||||
PlayerData playerData = plugin.pl.getData(args[3]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
@ -130,7 +130,7 @@ public class Command_manageshop extends FreedomCommand
|
||||
try
|
||||
{
|
||||
int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
|
||||
PlayerData playerData = plugin.pl.getData(args[3]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
@ -180,7 +180,7 @@ public class Command_manageshop extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
|
||||
PlayerData playerData = plugin.pl.getData(args[3]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
@ -205,7 +205,7 @@ public class Command_manageshop extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
|
||||
PlayerData playerData = plugin.pl.getData(args[3]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
|
||||
@ -45,7 +45,7 @@ public class Command_mbconfig extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
|
||||
PlayerData data = plugin.pl.getData(sender.getName());
|
||||
if (!data.isMasterBuilder())
|
||||
{
|
||||
msg("You are not a master builder!", ChatColor.RED);
|
||||
@ -74,7 +74,7 @@ public class Command_mbconfig extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
|
||||
PlayerData data = plugin.pl.getData(sender.getName());
|
||||
final String targetIp = FUtil.getIp(playerSender);
|
||||
|
||||
if (!data.isMasterBuilder())
|
||||
@ -101,14 +101,14 @@ public class Command_mbconfig extends FreedomCommand
|
||||
return false;
|
||||
}
|
||||
|
||||
if (plugin.pl.canManageMasterBuilders(FUtil.getUUIDFromName(sender.getName())))
|
||||
if (plugin.pl.canManageMasterBuilders(sender.getName()))
|
||||
{
|
||||
return noPerms();
|
||||
}
|
||||
|
||||
final Player player = getPlayer(args[1]);
|
||||
|
||||
PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
|
||||
PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]);
|
||||
|
||||
if (data == null)
|
||||
{
|
||||
@ -157,13 +157,13 @@ public class Command_mbconfig extends FreedomCommand
|
||||
return false;
|
||||
}
|
||||
|
||||
if (plugin.pl.canManageMasterBuilders(FUtil.getUUIDFromName(sender.getName())))
|
||||
if (plugin.pl.canManageMasterBuilders(sender.getName()))
|
||||
{
|
||||
return noPerms();
|
||||
}
|
||||
|
||||
Player player = getPlayer(args[1]);
|
||||
PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
|
||||
PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]);
|
||||
|
||||
if (data == null || !data.isMasterBuilder())
|
||||
{
|
||||
@ -210,7 +210,7 @@ public class Command_mbconfig extends FreedomCommand
|
||||
}
|
||||
else if (args[0].equalsIgnoreCase("clearip"))
|
||||
{
|
||||
PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
|
||||
PlayerData data = plugin.pl.getData(sender.getName());
|
||||
if (data.isMasterBuilder())
|
||||
{
|
||||
return data.getIps();
|
||||
|
||||
@ -170,7 +170,7 @@ public class Command_myadmin extends FreedomCommand
|
||||
msg("Role syncing is not enabled.", ChatColor.RED);
|
||||
return true;
|
||||
}
|
||||
PlayerData playerData = plugin.pl.getData(target.getUniqueId());
|
||||
PlayerData playerData = plugin.pl.getData(target.getName());
|
||||
if (playerData.getDiscordID() == null)
|
||||
{
|
||||
msg("Please run /linkdiscord first!", ChatColor.RED);
|
||||
@ -248,7 +248,7 @@ public class Command_myadmin extends FreedomCommand
|
||||
{
|
||||
if (args[0].equals("-o") && args[2].equals("clearip"))
|
||||
{
|
||||
Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
|
||||
Admin admin = plugin.al.getEntryByName(args[1]);
|
||||
if (admin != null)
|
||||
{
|
||||
return admin.getIps();
|
||||
|
||||
@ -31,7 +31,7 @@ public class Command_notes extends FreedomCommand
|
||||
final Player player = getPlayer(args[0]);
|
||||
if (player == null)
|
||||
{
|
||||
final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
final PlayerData entry = plugin.pl.getData(args[0]);
|
||||
|
||||
if (entry == null)
|
||||
{
|
||||
@ -39,7 +39,7 @@ public class Command_notes extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
playerData = entry;
|
||||
playerData = plugin.pl.getData(entry.getName());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -5,8 +5,6 @@ import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.discord.Discord;
|
||||
@ -36,7 +34,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
{
|
||||
case "list":
|
||||
{
|
||||
msg("Admins: " + StringUtils.join(plugin.al.getAdminUUIDs().stream().map(FUtil::getNameFromUUID).collect(Collectors.toList()), ", "), ChatColor.GOLD);
|
||||
msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -47,7 +45,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
|
||||
FUtil.adminAction(sender.getName(), "Cleaning the admin list", true);
|
||||
plugin.al.deactivateOldEntries(true);
|
||||
msg("Admins: " + StringUtils.join(plugin.al.getAdminUUIDs().stream().map(FUtil::getNameFromUUID).collect(Collectors.toList()), ", "), ChatColor.GOLD);
|
||||
msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -91,7 +89,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
|
||||
Admin admin = plugin.al.getEntryByName(args[1]);
|
||||
if (admin == null)
|
||||
{
|
||||
msg("Unknown admin: " + args[1]);
|
||||
@ -111,7 +109,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
|
||||
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
|
||||
{
|
||||
Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
|
||||
Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
|
||||
}
|
||||
|
||||
plugin.ptero.updateAccountStatus(admin);
|
||||
@ -129,7 +127,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
|
||||
checkRank(Rank.ADMIN);
|
||||
|
||||
Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
|
||||
Admin admin = plugin.al.getEntryByName(args[1]);
|
||||
|
||||
if (admin == null)
|
||||
{
|
||||
@ -208,12 +206,12 @@ public class Command_saconfig extends FreedomCommand
|
||||
{
|
||||
FUtil.adminAction(sender.getName(), "Re-adding " + player.getName() + " to the admin list", true);
|
||||
|
||||
/*String oldName = admin.getName();
|
||||
String oldName = admin.getName();
|
||||
if (!oldName.equals(player.getName()))
|
||||
{
|
||||
admin.setName(player.getName());
|
||||
plugin.sql.updateAdminName(oldName, admin.getName());
|
||||
}*/
|
||||
}
|
||||
admin.addIp(FUtil.getIp(player));
|
||||
|
||||
admin.setActive(true);
|
||||
@ -261,7 +259,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
checkRank(Rank.ADMIN);
|
||||
|
||||
Player player = getPlayer(args[1]);
|
||||
Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
|
||||
Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]);
|
||||
|
||||
if (admin == null)
|
||||
{
|
||||
@ -282,7 +280,7 @@ public class Command_saconfig extends FreedomCommand
|
||||
|
||||
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
|
||||
{
|
||||
Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
|
||||
Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
|
||||
}
|
||||
|
||||
plugin.ptero.updateAccountStatus(admin);
|
||||
|
||||
@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod.command;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@ -39,7 +38,7 @@ public class Command_settotalvotes extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
|
||||
PlayerData playerData = plugin.pl.getData(args[1]);
|
||||
|
||||
if (playerData == null)
|
||||
{
|
||||
|
||||
@ -46,7 +46,7 @@ public class Command_tban extends FreedomCommand
|
||||
final PlayerData entry;
|
||||
if (player == null)
|
||||
{
|
||||
entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
entry = plugin.pl.getData(args[0]);
|
||||
|
||||
if (entry == null)
|
||||
{
|
||||
|
||||
@ -53,7 +53,7 @@ public class Command_tempban extends FreedomCommand
|
||||
final PlayerData entry;
|
||||
if (player == null)
|
||||
{
|
||||
entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
entry = plugin.pl.getData(args[0]);
|
||||
|
||||
if (entry == null)
|
||||
{
|
||||
|
||||
@ -22,7 +22,7 @@ public class Command_unban extends FreedomCommand
|
||||
if (args.length > 0)
|
||||
{
|
||||
String username;
|
||||
final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
final PlayerData entry = plugin.pl.getData(args[0]);
|
||||
|
||||
if (entry == null)
|
||||
{
|
||||
|
||||
@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.command;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@ -24,7 +23,7 @@ public class Command_unlinkdiscord extends FreedomCommand
|
||||
|
||||
if (args.length != 0 && plugin.al.isAdmin(playerSender))
|
||||
{
|
||||
PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
|
||||
PlayerData playerData = plugin.pl.getData(args[0]);
|
||||
if (playerData == null)
|
||||
{
|
||||
msg(PLAYER_NOT_FOUND);
|
||||
|
||||
@ -24,7 +24,7 @@ public class PrivateMessageListener extends ListenerAdapter
|
||||
player.setDiscordID(event.getMessage().getAuthor().getId());
|
||||
player.setVerification(true);
|
||||
|
||||
Admin admin = TotalFreedomMod.getPlugin().al.getEntryByUUID(player.getUniqueId());
|
||||
Admin admin = TotalFreedomMod.getPlugin().al.getEntryByName(name);
|
||||
if (admin != null)
|
||||
{
|
||||
Discord.syncRoles(admin, player.getDiscordID());
|
||||
|
||||
@ -16,22 +16,23 @@ import org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class FPlayer {
|
||||
public class FPlayer
|
||||
{
|
||||
|
||||
public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L;
|
||||
|
||||
|
||||
private final TotalFreedomMod plugin;
|
||||
|
||||
private final UUID uuid;
|
||||
private final String name;
|
||||
|
||||
private final String ip;
|
||||
//
|
||||
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 PlayerData playerData;
|
||||
//
|
||||
private BukkitTask unmuteTask;
|
||||
private double fuckoffRadius = 0;
|
||||
@ -70,295 +71,376 @@ public class FPlayer {
|
||||
|
||||
private boolean invSee = false;
|
||||
|
||||
|
||||
public FPlayer(TotalFreedomMod plugin, Player player) {
|
||||
this(plugin, player.getUniqueId());
|
||||
public FPlayer(TotalFreedomMod plugin, Player player)
|
||||
{
|
||||
this(plugin, player.getName(), FUtil.getIp(player));
|
||||
}
|
||||
|
||||
private FPlayer(TotalFreedomMod plugin, UUID uuid) {
|
||||
private FPlayer(TotalFreedomMod plugin, String name, String ip)
|
||||
{
|
||||
this.plugin = plugin;
|
||||
this.uuid = uuid;
|
||||
this.name = name;
|
||||
this.ip = ip;
|
||||
}
|
||||
|
||||
public static long getAutoPurgeTicks() {
|
||||
public static long getAutoPurgeTicks()
|
||||
{
|
||||
return AUTO_PURGE_TICKS;
|
||||
}
|
||||
|
||||
public Player getPlayer() {
|
||||
if (this.player == null) {
|
||||
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
|
||||
if (onlinePlayer.getUniqueId().equals(this.uuid)) {
|
||||
this.player = onlinePlayer;
|
||||
public Player getPlayer()
|
||||
{
|
||||
if (player != null && !player.isOnline())
|
||||
{
|
||||
player = null;
|
||||
}
|
||||
|
||||
if (player == null)
|
||||
{
|
||||
for (Player onlinePlayer : Bukkit.getOnlinePlayers())
|
||||
{
|
||||
if (FUtil.getIp(onlinePlayer).equals(ip))
|
||||
{
|
||||
player = onlinePlayer;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return this.player;
|
||||
return player;
|
||||
}
|
||||
|
||||
public void setPlayer(Player player) {
|
||||
public void setPlayer(Player player)
|
||||
{
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public boolean isOrbiting() {
|
||||
public boolean isOrbiting()
|
||||
{
|
||||
return isOrbiting;
|
||||
}
|
||||
|
||||
public void setOrbiting(boolean orbiting) {
|
||||
public void setOrbiting(boolean orbiting)
|
||||
{
|
||||
isOrbiting = orbiting;
|
||||
}
|
||||
|
||||
public void startOrbiting(double strength) {
|
||||
public void startOrbiting(double strength)
|
||||
{
|
||||
this.isOrbiting = true;
|
||||
this.orbitStrength = strength;
|
||||
}
|
||||
|
||||
public void stopOrbiting() {
|
||||
public void stopOrbiting()
|
||||
{
|
||||
this.isOrbiting = false;
|
||||
}
|
||||
|
||||
public double orbitStrength() {
|
||||
public double orbitStrength()
|
||||
{
|
||||
return orbitStrength;
|
||||
}
|
||||
|
||||
public boolean isFuckOff() {
|
||||
public boolean isFuckOff()
|
||||
{
|
||||
return fuckoffRadius > 0;
|
||||
}
|
||||
|
||||
public void setFuckoff(double radius) {
|
||||
public void setFuckoff(double radius)
|
||||
{
|
||||
this.fuckoffRadius = radius;
|
||||
}
|
||||
|
||||
public void disableFuckoff() {
|
||||
public void disableFuckoff()
|
||||
{
|
||||
this.fuckoffRadius = 0;
|
||||
}
|
||||
|
||||
public void resetMsgCount() {
|
||||
public void resetMsgCount()
|
||||
{
|
||||
this.messageCount = 0;
|
||||
}
|
||||
|
||||
public int incrementAndGetMsgCount() {
|
||||
public int incrementAndGetMsgCount()
|
||||
{
|
||||
return this.messageCount++;
|
||||
}
|
||||
|
||||
public int incrementAndGetBlockDestroyCount() {
|
||||
public int incrementAndGetBlockDestroyCount()
|
||||
{
|
||||
return this.totalBlockDestroy++;
|
||||
}
|
||||
|
||||
public void resetBlockDestroyCount() {
|
||||
public void resetBlockDestroyCount()
|
||||
{
|
||||
this.totalBlockDestroy = 0;
|
||||
}
|
||||
|
||||
public int incrementAndGetBlockPlaceCount() {
|
||||
public int incrementAndGetBlockPlaceCount()
|
||||
{
|
||||
return this.totalBlockPlace++;
|
||||
}
|
||||
|
||||
public void resetBlockPlaceCount() {
|
||||
public void resetBlockPlaceCount()
|
||||
{
|
||||
this.totalBlockPlace = 0;
|
||||
}
|
||||
|
||||
public int incrementAndGetFreecamDestroyCount() {
|
||||
public int incrementAndGetFreecamDestroyCount()
|
||||
{
|
||||
return this.freecamDestroyCount++;
|
||||
}
|
||||
|
||||
public void resetFreecamDestroyCount() {
|
||||
public void resetFreecamDestroyCount()
|
||||
{
|
||||
this.freecamDestroyCount = 0;
|
||||
}
|
||||
|
||||
public int incrementAndGetFreecamPlaceCount() {
|
||||
public int incrementAndGetFreecamPlaceCount()
|
||||
{
|
||||
return this.freecamPlaceCount++;
|
||||
}
|
||||
|
||||
public void resetFreecamPlaceCount() {
|
||||
public void resetFreecamPlaceCount()
|
||||
{
|
||||
this.freecamPlaceCount = 0;
|
||||
}
|
||||
|
||||
public void enableMobThrower(EntityType mobThrowerCreature, double mobThrowerSpeed) {
|
||||
public void enableMobThrower(EntityType mobThrowerCreature, double mobThrowerSpeed)
|
||||
{
|
||||
this.mobThrowerEnabled = true;
|
||||
this.mobThrowerEntity = mobThrowerCreature;
|
||||
this.mobThrowerSpeed = mobThrowerSpeed;
|
||||
}
|
||||
|
||||
public void disableMobThrower() {
|
||||
public void disableMobThrower()
|
||||
{
|
||||
this.mobThrowerEnabled = false;
|
||||
}
|
||||
|
||||
public EntityType mobThrowerCreature() {
|
||||
public EntityType mobThrowerCreature()
|
||||
{
|
||||
return this.mobThrowerEntity;
|
||||
}
|
||||
|
||||
public double mobThrowerSpeed() {
|
||||
public double mobThrowerSpeed()
|
||||
{
|
||||
return this.mobThrowerSpeed;
|
||||
}
|
||||
|
||||
public boolean mobThrowerEnabled() {
|
||||
public boolean mobThrowerEnabled()
|
||||
{
|
||||
return this.mobThrowerEnabled;
|
||||
}
|
||||
|
||||
public void enqueueMob(LivingEntity mob) {
|
||||
public void enqueueMob(LivingEntity mob)
|
||||
{
|
||||
mobThrowerQueue.add(mob);
|
||||
if (mobThrowerQueue.size() > 4) {
|
||||
if (mobThrowerQueue.size() > 4)
|
||||
{
|
||||
LivingEntity oldmob = mobThrowerQueue.remove(0);
|
||||
if (oldmob != null) {
|
||||
if (oldmob != null)
|
||||
{
|
||||
oldmob.damage(500.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void startArrowShooter(TotalFreedomMod plugin) {
|
||||
public void startArrowShooter(TotalFreedomMod plugin)
|
||||
{
|
||||
this.stopArrowShooter();
|
||||
this.mp44ScheduleTask = new ArrowShooter(getPlayer()).runTaskTimer(plugin, 1L, 1L);
|
||||
this.mp44Firing = true;
|
||||
}
|
||||
|
||||
public void stopArrowShooter() {
|
||||
if (this.mp44ScheduleTask != null) {
|
||||
public void stopArrowShooter()
|
||||
{
|
||||
if (this.mp44ScheduleTask != null)
|
||||
{
|
||||
this.mp44ScheduleTask.cancel();
|
||||
this.mp44ScheduleTask = null;
|
||||
}
|
||||
this.mp44Firing = false;
|
||||
}
|
||||
|
||||
public void armMP44() {
|
||||
public void armMP44()
|
||||
{
|
||||
this.mp44Armed = true;
|
||||
this.stopArrowShooter();
|
||||
}
|
||||
|
||||
public void disarmMP44() {
|
||||
public void disarmMP44()
|
||||
{
|
||||
this.mp44Armed = false;
|
||||
this.stopArrowShooter();
|
||||
}
|
||||
|
||||
public boolean isMP44Armed() {
|
||||
public boolean isMP44Armed()
|
||||
{
|
||||
return this.mp44Armed;
|
||||
}
|
||||
|
||||
public boolean toggleMP44Firing() {
|
||||
public boolean toggleMP44Firing()
|
||||
{
|
||||
this.mp44Firing = !this.mp44Firing;
|
||||
return mp44Firing;
|
||||
}
|
||||
|
||||
public boolean isMuted() {
|
||||
public boolean isMuted()
|
||||
{
|
||||
return unmuteTask != null;
|
||||
}
|
||||
|
||||
public void setMuted(boolean muted, int minutes) {
|
||||
public void setMuted(boolean muted, int minutes)
|
||||
{
|
||||
FUtil.cancel(unmuteTask);
|
||||
plugin.mu.MUTED_PLAYERS.remove(getPlayer().getUniqueId());
|
||||
plugin.mu.MUTED_PLAYERS.remove(getPlayer().getName());
|
||||
unmuteTask = null;
|
||||
|
||||
if (!muted) {
|
||||
if (!muted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (getPlayer() == null) {
|
||||
if (getPlayer() == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
plugin.mu.MUTED_PLAYERS.add(getPlayer().getUniqueId());
|
||||
plugin.mu.MUTED_PLAYERS.add(getPlayer().getName());
|
||||
|
||||
// TODO: Simplify this into a Consumer<BukkitTask> lambda?
|
||||
unmuteTask = new BukkitRunnable() {
|
||||
unmuteTask = new BukkitRunnable()
|
||||
{
|
||||
@Override
|
||||
public void run() {
|
||||
if (getPlayer() != null) {
|
||||
public void run()
|
||||
{
|
||||
if (getPlayer() != null)
|
||||
{
|
||||
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
|
||||
setMuted(false);
|
||||
} else {
|
||||
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + Bukkit.getOfflinePlayer(uuid).getName(), false);
|
||||
plugin.mu.MUTED_PLAYERS.remove(uuid);
|
||||
}
|
||||
else
|
||||
{
|
||||
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
|
||||
plugin.mu.MUTED_PLAYERS.remove(getName());
|
||||
}
|
||||
}
|
||||
}.runTaskLater(plugin, minutes * (60L * 20L));
|
||||
}
|
||||
|
||||
public void setMuted(boolean muted) {
|
||||
public void setMuted(boolean muted)
|
||||
{
|
||||
setMuted(muted, 5);
|
||||
}
|
||||
|
||||
public BukkitTask getLockupScheduleID() {
|
||||
public BukkitTask getLockupScheduleID()
|
||||
{
|
||||
return this.lockupScheduleTask;
|
||||
}
|
||||
|
||||
public void setLockupScheduleId(BukkitTask id) {
|
||||
public void setLockupScheduleId(BukkitTask id)
|
||||
{
|
||||
this.lockupScheduleTask = id;
|
||||
}
|
||||
|
||||
public boolean isLockedUp() {
|
||||
public boolean isLockedUp()
|
||||
{
|
||||
return this.lockedUp;
|
||||
}
|
||||
|
||||
public void setLockedUp(boolean lockedUp) {
|
||||
public void setLockedUp(boolean lockedUp)
|
||||
{
|
||||
this.lockedUp = lockedUp;
|
||||
}
|
||||
|
||||
public String getLastMessage() {
|
||||
public String getLastMessage()
|
||||
{
|
||||
return lastMessage;
|
||||
}
|
||||
|
||||
public void setLastMessage(String message) {
|
||||
public void setLastMessage(String message)
|
||||
{
|
||||
this.lastMessage = message;
|
||||
}
|
||||
|
||||
public void setAdminChat(boolean inAdminchat) {
|
||||
public void setAdminChat(boolean inAdminchat)
|
||||
{
|
||||
this.inAdminchat = inAdminchat;
|
||||
}
|
||||
|
||||
public boolean inAdminChat() {
|
||||
public boolean inAdminChat()
|
||||
{
|
||||
return this.inAdminchat;
|
||||
}
|
||||
|
||||
public boolean allCommandsBlocked() {
|
||||
public boolean allCommandsBlocked()
|
||||
{
|
||||
return this.allCommandsBlocked;
|
||||
}
|
||||
|
||||
public void setCommandsBlocked(boolean commandsBlocked) {
|
||||
public void setCommandsBlocked(boolean commandsBlocked)
|
||||
{
|
||||
this.allCommandsBlocked = commandsBlocked;
|
||||
}
|
||||
|
||||
public String getLastCommand() {
|
||||
public String getLastCommand()
|
||||
{
|
||||
return lastCommand;
|
||||
}
|
||||
|
||||
public void setLastCommand(String lastCommand) {
|
||||
public void setLastCommand(String lastCommand)
|
||||
{
|
||||
this.lastCommand = lastCommand;
|
||||
}
|
||||
|
||||
public void setCommandSpy(boolean enabled) {
|
||||
public void setCommandSpy(boolean enabled)
|
||||
{
|
||||
this.cmdspyEnabled = enabled;
|
||||
}
|
||||
|
||||
public boolean cmdspyEnabled() {
|
||||
public boolean cmdspyEnabled()
|
||||
{
|
||||
return cmdspyEnabled;
|
||||
}
|
||||
|
||||
public String getTag() {
|
||||
public String getTag()
|
||||
{
|
||||
return this.tag;
|
||||
}
|
||||
|
||||
public void setTag(String tag) {
|
||||
if (tag == null) {
|
||||
public void setTag(String tag)
|
||||
{
|
||||
if (tag == null)
|
||||
{
|
||||
this.tag = null;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
this.tag = FUtil.colorize(tag) + ChatColor.WHITE;
|
||||
}
|
||||
}
|
||||
|
||||
public int getWarningCount() {
|
||||
public int getWarningCount()
|
||||
{
|
||||
return this.warningCount;
|
||||
}
|
||||
|
||||
public void setWarningCount(int warningCount) {
|
||||
public void setWarningCount(int warningCount)
|
||||
{
|
||||
this.warningCount = warningCount;
|
||||
}
|
||||
|
||||
public void incrementWarnings(boolean quiet) {
|
||||
public void incrementWarnings(boolean quiet)
|
||||
{
|
||||
this.warningCount++;
|
||||
|
||||
if (this.warningCount % 2 == 0) {
|
||||
if (this.warningCount % 2 == 0)
|
||||
{
|
||||
Player p = getPlayer();
|
||||
|
||||
if (!quiet) {
|
||||
if (!quiet)
|
||||
{
|
||||
p.getWorld().strikeLightning(p.getLocation());
|
||||
}
|
||||
|
||||
@ -366,221 +448,271 @@ public class FPlayer {
|
||||
}
|
||||
}
|
||||
|
||||
public TotalFreedomMod getPlugin() {
|
||||
public TotalFreedomMod getPlugin()
|
||||
{
|
||||
return plugin;
|
||||
}
|
||||
|
||||
public UUID getUniqueId() {
|
||||
return uuid;
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public PlayerData getPlayerData() {
|
||||
return playerData;
|
||||
public String getIp()
|
||||
{
|
||||
return ip;
|
||||
}
|
||||
|
||||
public BukkitTask getUnmuteTask() {
|
||||
public BukkitTask getUnmuteTask()
|
||||
{
|
||||
return unmuteTask;
|
||||
}
|
||||
|
||||
public void setUnmuteTask(BukkitTask unmuteTask) {
|
||||
public void setUnmuteTask(BukkitTask unmuteTask)
|
||||
{
|
||||
this.unmuteTask = unmuteTask;
|
||||
}
|
||||
|
||||
public FreezeData getFreezeData() {
|
||||
public FreezeData getFreezeData()
|
||||
{
|
||||
return freezeData;
|
||||
}
|
||||
|
||||
public double getFuckoffRadius() {
|
||||
public double getFuckoffRadius()
|
||||
{
|
||||
return fuckoffRadius;
|
||||
}
|
||||
|
||||
public void setFuckoffRadius(double fuckoffRadius) {
|
||||
public void setFuckoffRadius(double fuckoffRadius)
|
||||
{
|
||||
this.fuckoffRadius = fuckoffRadius;
|
||||
}
|
||||
|
||||
public int getMessageCount() {
|
||||
public int getMessageCount()
|
||||
{
|
||||
return messageCount;
|
||||
}
|
||||
|
||||
public void setMessageCount(int messageCount) {
|
||||
public void setMessageCount(int messageCount)
|
||||
{
|
||||
this.messageCount = messageCount;
|
||||
}
|
||||
|
||||
public int getTotalBlockDestroy() {
|
||||
public int getTotalBlockDestroy()
|
||||
{
|
||||
return totalBlockDestroy;
|
||||
}
|
||||
|
||||
public void setTotalBlockDestroy(int totalBlockDestroy) {
|
||||
public void setTotalBlockDestroy(int totalBlockDestroy)
|
||||
{
|
||||
this.totalBlockDestroy = totalBlockDestroy;
|
||||
}
|
||||
|
||||
public int getTotalBlockPlace() {
|
||||
public int getTotalBlockPlace()
|
||||
{
|
||||
return totalBlockPlace;
|
||||
}
|
||||
|
||||
public void setTotalBlockPlace(int totalBlockPlace) {
|
||||
public void setTotalBlockPlace(int totalBlockPlace)
|
||||
{
|
||||
this.totalBlockPlace = totalBlockPlace;
|
||||
}
|
||||
|
||||
public int getFreecamDestroyCount() {
|
||||
public int getFreecamDestroyCount()
|
||||
{
|
||||
return freecamDestroyCount;
|
||||
}
|
||||
|
||||
public void setFreecamDestroyCount(int freecamDestroyCount) {
|
||||
public void setFreecamDestroyCount(int freecamDestroyCount)
|
||||
{
|
||||
this.freecamDestroyCount = freecamDestroyCount;
|
||||
}
|
||||
|
||||
public int getFreecamPlaceCount() {
|
||||
public int getFreecamPlaceCount()
|
||||
{
|
||||
return freecamPlaceCount;
|
||||
}
|
||||
|
||||
public void setFreecamPlaceCount(int freecamPlaceCount) {
|
||||
public void setFreecamPlaceCount(int freecamPlaceCount)
|
||||
{
|
||||
this.freecamPlaceCount = freecamPlaceCount;
|
||||
}
|
||||
|
||||
public CageData getCageData() {
|
||||
public CageData getCageData()
|
||||
{
|
||||
return cageData;
|
||||
}
|
||||
|
||||
public double getOrbitStrength() {
|
||||
public double getOrbitStrength()
|
||||
{
|
||||
return orbitStrength;
|
||||
}
|
||||
|
||||
public void setOrbitStrength(double orbitStrength) {
|
||||
public void setOrbitStrength(double orbitStrength)
|
||||
{
|
||||
this.orbitStrength = orbitStrength;
|
||||
}
|
||||
|
||||
public boolean isMobThrowerEnabled() {
|
||||
public boolean isMobThrowerEnabled()
|
||||
{
|
||||
return mobThrowerEnabled;
|
||||
}
|
||||
|
||||
public void setMobThrowerEnabled(boolean mobThrowerEnabled) {
|
||||
public void setMobThrowerEnabled(boolean mobThrowerEnabled)
|
||||
{
|
||||
this.mobThrowerEnabled = mobThrowerEnabled;
|
||||
}
|
||||
|
||||
public EntityType getMobThrowerEntity() {
|
||||
public EntityType getMobThrowerEntity()
|
||||
{
|
||||
return mobThrowerEntity;
|
||||
}
|
||||
|
||||
public void setMobThrowerEntity(EntityType mobThrowerEntity) {
|
||||
public void setMobThrowerEntity(EntityType mobThrowerEntity)
|
||||
{
|
||||
this.mobThrowerEntity = mobThrowerEntity;
|
||||
}
|
||||
|
||||
public double getMobThrowerSpeed() {
|
||||
public double getMobThrowerSpeed()
|
||||
{
|
||||
return mobThrowerSpeed;
|
||||
}
|
||||
|
||||
public void setPlayerData(PlayerData playerData) {
|
||||
this.playerData = playerData;
|
||||
}
|
||||
|
||||
public void setMobThrowerSpeed(double mobThrowerSpeed) {
|
||||
public void setMobThrowerSpeed(double mobThrowerSpeed)
|
||||
{
|
||||
this.mobThrowerSpeed = mobThrowerSpeed;
|
||||
}
|
||||
|
||||
public List<LivingEntity> getMobThrowerQueue() {
|
||||
public List<LivingEntity> getMobThrowerQueue()
|
||||
{
|
||||
return mobThrowerQueue;
|
||||
}
|
||||
|
||||
public BukkitTask getMp44ScheduleTask() {
|
||||
public BukkitTask getMp44ScheduleTask()
|
||||
{
|
||||
return mp44ScheduleTask;
|
||||
}
|
||||
|
||||
public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask) {
|
||||
public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask)
|
||||
{
|
||||
this.mp44ScheduleTask = mp44ScheduleTask;
|
||||
}
|
||||
|
||||
public boolean isMp44Armed() {
|
||||
public boolean isMp44Armed()
|
||||
{
|
||||
return mp44Armed;
|
||||
}
|
||||
|
||||
public void setMp44Armed(boolean mp44Armed) {
|
||||
public void setMp44Armed(boolean mp44Armed)
|
||||
{
|
||||
this.mp44Armed = mp44Armed;
|
||||
}
|
||||
|
||||
public boolean isMp44Firing() {
|
||||
public boolean isMp44Firing()
|
||||
{
|
||||
return mp44Firing;
|
||||
}
|
||||
|
||||
public void setMp44Firing(boolean mp44Firing) {
|
||||
public void setMp44Firing(boolean mp44Firing)
|
||||
{
|
||||
this.mp44Firing = mp44Firing;
|
||||
}
|
||||
|
||||
public BukkitTask getLockupScheduleTask() {
|
||||
public BukkitTask getLockupScheduleTask()
|
||||
{
|
||||
return lockupScheduleTask;
|
||||
}
|
||||
|
||||
public void setLockupScheduleTask(BukkitTask lockupScheduleTask) {
|
||||
public void setLockupScheduleTask(BukkitTask lockupScheduleTask)
|
||||
{
|
||||
this.lockupScheduleTask = lockupScheduleTask;
|
||||
}
|
||||
|
||||
public boolean isInAdminchat() {
|
||||
public boolean isInAdminchat()
|
||||
{
|
||||
return inAdminchat;
|
||||
}
|
||||
|
||||
public void setInAdminchat(boolean inAdminchat) {
|
||||
public void setInAdminchat(boolean inAdminchat)
|
||||
{
|
||||
this.inAdminchat = inAdminchat;
|
||||
}
|
||||
|
||||
public boolean isAllCommandsBlocked() {
|
||||
public boolean isAllCommandsBlocked()
|
||||
{
|
||||
return allCommandsBlocked;
|
||||
}
|
||||
|
||||
public void setAllCommandsBlocked(boolean allCommandsBlocked) {
|
||||
public void setAllCommandsBlocked(boolean allCommandsBlocked)
|
||||
{
|
||||
this.allCommandsBlocked = allCommandsBlocked;
|
||||
}
|
||||
|
||||
public boolean isSuperadminIdVerified() {
|
||||
public boolean isSuperadminIdVerified()
|
||||
{
|
||||
return superadminIdVerified;
|
||||
}
|
||||
|
||||
public void setSuperadminIdVerified(boolean superadminIdVerified) {
|
||||
public void setSuperadminIdVerified(boolean superadminIdVerified)
|
||||
{
|
||||
this.superadminIdVerified = superadminIdVerified;
|
||||
}
|
||||
|
||||
public boolean isCmdspyEnabled() {
|
||||
public boolean isCmdspyEnabled()
|
||||
{
|
||||
return cmdspyEnabled;
|
||||
}
|
||||
|
||||
public void setCmdspyEnabled(boolean cmdspyEnabled) {
|
||||
public void setCmdspyEnabled(boolean cmdspyEnabled)
|
||||
{
|
||||
this.cmdspyEnabled = cmdspyEnabled;
|
||||
}
|
||||
|
||||
public boolean isEditBlocked() {
|
||||
public boolean isEditBlocked()
|
||||
{
|
||||
return editBlocked;
|
||||
}
|
||||
|
||||
public void setEditBlocked(boolean editBlocked) {
|
||||
public void setEditBlocked(boolean editBlocked)
|
||||
{
|
||||
this.editBlocked = editBlocked;
|
||||
}
|
||||
|
||||
public boolean isPvpBlocked() {
|
||||
public boolean isPvpBlocked()
|
||||
{
|
||||
return pvpBlocked;
|
||||
}
|
||||
|
||||
public void setPvpBlocked(boolean pvpBlocked) {
|
||||
public void setPvpBlocked(boolean pvpBlocked)
|
||||
{
|
||||
this.pvpBlocked = pvpBlocked;
|
||||
}
|
||||
|
||||
public boolean isInvSee() {
|
||||
public boolean isInvSee()
|
||||
{
|
||||
return invSee;
|
||||
}
|
||||
|
||||
public void setInvSee(boolean invSee) {
|
||||
public void setInvSee(boolean invSee)
|
||||
{
|
||||
this.invSee = invSee;
|
||||
}
|
||||
|
||||
private static class ArrowShooter extends BukkitRunnable {
|
||||
private static class ArrowShooter extends BukkitRunnable
|
||||
{
|
||||
|
||||
private final Player player;
|
||||
|
||||
private ArrowShooter(Player player) {
|
||||
private ArrowShooter(Player player)
|
||||
{
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
if (player != null) {
|
||||
public void run()
|
||||
{
|
||||
if (player != null)
|
||||
{
|
||||
Arrow shot = player.launchProjectile(Arrow.class);
|
||||
shot.setVelocity(shot.getVelocity().multiply(2.0));
|
||||
}
|
||||
|
||||
@ -3,8 +3,10 @@ package me.totalfreedom.totalfreedommod.player;
|
||||
import com.google.common.collect.Lists;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||
import me.totalfreedom.totalfreedommod.shop.ShopItem;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
@ -18,7 +20,7 @@ public class PlayerData
|
||||
private final List<String> ips = Lists.newArrayList();
|
||||
private final List<String> notes = Lists.newArrayList();
|
||||
private final List<String> backupCodes = Lists.newArrayList();
|
||||
private UUID uuid;
|
||||
private String name;
|
||||
private String tag = null;
|
||||
private String discordID = null;
|
||||
private Boolean masterBuilder = false;
|
||||
@ -46,7 +48,7 @@ public class PlayerData
|
||||
{
|
||||
try
|
||||
{
|
||||
uuid = UUID.fromString(resultSet.getString("uuid"));
|
||||
name = resultSet.getString("username");
|
||||
ips.clear();
|
||||
ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
|
||||
notes.clear();
|
||||
@ -86,13 +88,14 @@ public class PlayerData
|
||||
|
||||
public PlayerData(Player player)
|
||||
{
|
||||
this.uuid = player.getUniqueId();
|
||||
this.name = player.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return "Player: " + uuid.toString() + "\n" +
|
||||
|
||||
return "Player: " + name + "\n" +
|
||||
"- IPs: " + StringUtils.join(ips, ", ") + "\n" +
|
||||
"- Discord ID: " + discordID + "\n" +
|
||||
"- Master Builder: " + masterBuilder + "\n" +
|
||||
@ -229,7 +232,7 @@ public class PlayerData
|
||||
{
|
||||
return new HashMap<String, Object>()
|
||||
{{
|
||||
put("uuid", uuid);
|
||||
put("username", name);
|
||||
put("ips", FUtil.listToString(ips));
|
||||
put("notes", FUtil.listToString(notes));
|
||||
put("tag", tag);
|
||||
@ -252,14 +255,14 @@ public class PlayerData
|
||||
return displayDiscord;
|
||||
}
|
||||
|
||||
public UUID getUniqueId()
|
||||
public String getName()
|
||||
{
|
||||
return uuid;
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setUniqueId(UUID uuid)
|
||||
public void setName(String name)
|
||||
{
|
||||
this.uuid = uuid;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getTag()
|
||||
@ -361,9 +364,4 @@ public class PlayerData
|
||||
{
|
||||
this.inspect = inspect;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return FUtil.getNameFromUUID(uuid);
|
||||
}
|
||||
}
|
||||
@ -3,9 +3,11 @@ package me.totalfreedom.totalfreedommod.player;
|
||||
import com.google.common.collect.Maps;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
@ -18,12 +20,13 @@ import org.bukkit.entity.Player;
|
||||
public class PlayerList extends FreedomService
|
||||
{
|
||||
|
||||
public final Map<UUID, FPlayer> playerMap = Maps.newHashMap(); // uuid,dataMap
|
||||
//public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data
|
||||
public final Map<String, FPlayer> playerMap = Maps.newHashMap(); // ip,dataMap
|
||||
public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data
|
||||
|
||||
@Override
|
||||
public void onStart()
|
||||
{
|
||||
dataMap.clear();
|
||||
loadMasterBuilders();
|
||||
}
|
||||
|
||||
@ -54,6 +57,7 @@ public class PlayerList extends FreedomService
|
||||
while (resultSet.next())
|
||||
{
|
||||
PlayerData playerData = load(resultSet);
|
||||
dataMap.put(playerData.getName(), playerData);
|
||||
}
|
||||
}
|
||||
catch (SQLException e)
|
||||
@ -69,20 +73,27 @@ public class PlayerList extends FreedomService
|
||||
return FUtil.getIp(Objects.requireNonNull(player.getPlayer()));
|
||||
}
|
||||
|
||||
final PlayerData entry = getData(player.getUniqueId());
|
||||
final PlayerData entry = getData(player.getName());
|
||||
|
||||
return (entry == null ? null : entry.getIps().iterator().next());
|
||||
}
|
||||
|
||||
public List<String> getMasterBuilderNames()
|
||||
{
|
||||
return playerMap.values().stream().map(FPlayer::getPlayerData).filter(PlayerData::isMasterBuilder).map(p -> FUtil.getNameFromUUID(p.getUniqueId())).collect(Collectors.toList());
|
||||
List<String> masterBuilders = new ArrayList<>();
|
||||
for (PlayerData playerData : plugin.pl.dataMap.values())
|
||||
{
|
||||
if (playerData.isMasterBuilder())
|
||||
{
|
||||
masterBuilders.add(playerData.getName());
|
||||
}
|
||||
}
|
||||
return masterBuilders;
|
||||
}
|
||||
|
||||
public boolean canManageMasterBuilders(UUID uuid)
|
||||
public boolean canManageMasterBuilders(String name)
|
||||
{
|
||||
PlayerData data = getData(uuid);
|
||||
String name = FUtil.getNameFromUUID(uuid);
|
||||
PlayerData data = getData(name);
|
||||
|
||||
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())
|
||||
@ -92,41 +103,31 @@ public class PlayerList extends FreedomService
|
||||
|
||||
public boolean isTelnetMasterBuilder(PlayerData playerData)
|
||||
{
|
||||
Admin admin = plugin.al.getEntryByUUID(playerData.getUniqueId());
|
||||
Admin admin = plugin.al.getEntryByName(playerData.getName());
|
||||
return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder();
|
||||
}
|
||||
|
||||
// May not return null
|
||||
public FPlayer getPlayer(Player player)
|
||||
{
|
||||
FPlayer tPlayer = playerMap.get(player.getUniqueId());
|
||||
FPlayer tPlayer = playerMap.get(FUtil.getIp(player));
|
||||
if (tPlayer != null)
|
||||
{
|
||||
return tPlayer;
|
||||
}
|
||||
|
||||
tPlayer = new FPlayer(plugin, player);
|
||||
playerMap.put(player.getUniqueId(), tPlayer);
|
||||
playerMap.put(FUtil.getIp(player), tPlayer);
|
||||
|
||||
return tPlayer;
|
||||
}
|
||||
|
||||
/*public PlayerData loadByName(String name)
|
||||
public PlayerData loadByName(String name)
|
||||
{
|
||||
return load(plugin.sql.getPlayerByName(name));
|
||||
}
|
||||
|
||||
public PlayerData loadByIp(String ip)
|
||||
{
|
||||
return load(plugin.sql.getPlayerByIp(ip));
|
||||
}*/
|
||||
|
||||
public PlayerData loadByUUID(UUID uuid)
|
||||
{
|
||||
return load(plugin.sql.getPlayerByUUID(uuid));
|
||||
}
|
||||
|
||||
private PlayerData loadByIp(String ip)
|
||||
{
|
||||
return load(plugin.sql.getPlayerByIp(ip));
|
||||
}
|
||||
@ -167,7 +168,7 @@ public class PlayerList extends FreedomService
|
||||
|
||||
if (plugin.al.isAdminImpostor(player))
|
||||
{
|
||||
Admin admin = plugin.al.getEntryByUUID(player.getUniqueId());
|
||||
Admin admin = plugin.al.getEntryByName(player.getName());
|
||||
admin.setLastLogin(new Date());
|
||||
admin.addIp(FUtil.getIp(player));
|
||||
plugin.al.updateTables();
|
||||
@ -179,7 +180,7 @@ public class PlayerList extends FreedomService
|
||||
|
||||
public void syncIps(Admin admin)
|
||||
{
|
||||
PlayerData playerData = getData(admin.getUniqueId());
|
||||
PlayerData playerData = getData(admin.getName());
|
||||
playerData.clearIps();
|
||||
playerData.addIps(admin.getIps());
|
||||
plugin.pl.save(playerData);
|
||||
@ -187,7 +188,7 @@ public class PlayerList extends FreedomService
|
||||
|
||||
public void syncIps(PlayerData playerData)
|
||||
{
|
||||
Admin admin = plugin.al.getEntryByUUID(playerData.getUniqueId());
|
||||
Admin admin = plugin.al.getEntryByName(playerData.getName());
|
||||
|
||||
if (admin != null && admin.isActive())
|
||||
{
|
||||
@ -203,7 +204,7 @@ public class PlayerList extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
ResultSet currentSave = plugin.sql.getPlayerByUUID(player.getUniqueId());
|
||||
ResultSet currentSave = plugin.sql.getPlayerByName(player.getName());
|
||||
for (Map.Entry<String, Object> entry : player.toSQLStorable().entrySet())
|
||||
{
|
||||
Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
|
||||
@ -222,32 +223,31 @@ public class PlayerList extends FreedomService
|
||||
public PlayerData getData(Player player)
|
||||
{
|
||||
// Check for existing data
|
||||
PlayerData playerData = playerMap.get(player.getUniqueId()).getPlayerData();
|
||||
PlayerData playerData = dataMap.get(player.getName());
|
||||
if (playerData != null)
|
||||
{
|
||||
return playerData;
|
||||
}
|
||||
|
||||
// Load data
|
||||
playerData = loadByUUID(player.getUniqueId());
|
||||
playerData = loadByName(player.getName());
|
||||
|
||||
/*if (playerData == null)
|
||||
if (playerData == null)
|
||||
{
|
||||
playerData = loadByIp(FUtil.getIp(player));
|
||||
if (playerData != null)
|
||||
{
|
||||
plugin.sql.updatePlayerName(playerData.getName(), player.getName());
|
||||
playerMap.get(player.getUniqueId()).setPlayerData(playerData);
|
||||
playerData.setName(player.getName());
|
||||
dataMap.put(player.getName(), playerData);
|
||||
return playerData;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
playerMap.get(player.getUniqueId()).setPlayerData(playerData);
|
||||
dataMap.put(player.getName(), playerData);
|
||||
return playerData;
|
||||
}*/
|
||||
|
||||
playerMap.get(player.getUniqueId()).setPlayerData(playerData);
|
||||
}
|
||||
|
||||
// Create new data if nonexistent
|
||||
FLog.info("Creating new player verification entry for " + player.getName());
|
||||
@ -257,7 +257,7 @@ public class PlayerList extends FreedomService
|
||||
playerData.addIp(FUtil.getIp(player));
|
||||
|
||||
// Store player
|
||||
playerMap.get(player.getUniqueId()).setPlayerData(playerData);
|
||||
dataMap.put(player.getName(), playerData);
|
||||
|
||||
// Save player
|
||||
plugin.sql.addPlayer(playerData);
|
||||
@ -265,10 +265,8 @@ public class PlayerList extends FreedomService
|
||||
|
||||
}
|
||||
|
||||
/*@Deprecated
|
||||
public PlayerData getData(String username)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
// Check for existing data
|
||||
PlayerData playerData = dataMap.get(username);
|
||||
if (playerData != null)
|
||||
@ -287,58 +285,28 @@ public class PlayerList extends FreedomService
|
||||
return null;
|
||||
}
|
||||
|
||||
return playerData;
|
||||
}*/
|
||||
|
||||
public PlayerData getData(UUID uuid)
|
||||
{
|
||||
PlayerData playerData = playerMap.get(uuid).getPlayerData();
|
||||
if (playerData != null)
|
||||
{
|
||||
return playerData;
|
||||
}
|
||||
|
||||
playerData = loadByUUID(uuid);
|
||||
|
||||
if (playerData != null)
|
||||
{
|
||||
playerMap.get(uuid).setPlayerData(playerData);
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
public PlayerData getDataByUUID(UUID uuid)
|
||||
{
|
||||
PlayerData player = loadByUUID(uuid);
|
||||
|
||||
if (player != null)
|
||||
{
|
||||
playerMap.get(uuid).setPlayerData(player);
|
||||
}
|
||||
|
||||
return player;
|
||||
}
|
||||
|
||||
public PlayerData getDataByIp(String ip)
|
||||
public PlayerData getDataByIp(String ip)
|
||||
{
|
||||
PlayerData player = loadByIp(ip);
|
||||
|
||||
if (player != null)
|
||||
{
|
||||
playerMap.get(player.getUniqueId()).setPlayerData(player);
|
||||
dataMap.put(player.getName(), player);
|
||||
}
|
||||
|
||||
return player;
|
||||
}
|
||||
|
||||
public Map<UUID, FPlayer> getPlayerMap()
|
||||
public Map<String, FPlayer> getPlayerMap()
|
||||
{
|
||||
return playerMap;
|
||||
}
|
||||
|
||||
public Map<String, PlayerData> getDataMap()
|
||||
{
|
||||
return dataMap;
|
||||
}
|
||||
}
|
||||
@ -117,7 +117,7 @@ public class RankManager extends FreedomService
|
||||
}
|
||||
|
||||
// Console admin, get by name
|
||||
Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
|
||||
Admin admin = plugin.al.getEntryByName(sender.getName());
|
||||
|
||||
// Unknown console: RCON?
|
||||
if (admin == null)
|
||||
|
||||
@ -37,7 +37,7 @@ public class Votifier extends FreedomService
|
||||
}
|
||||
else
|
||||
{
|
||||
data = plugin.pl.getData(FUtil.getUUIDFromName(name));
|
||||
data = plugin.pl.getData(name);
|
||||
}
|
||||
|
||||
if (data != null)
|
||||
|
||||
@ -7,8 +7,6 @@ import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.UUID;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.banning.Ban;
|
||||
@ -72,7 +70,6 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
//TODO: move bans to uuid
|
||||
connection.createStatement().execute("CREATE TABLE `bans` (`name` VARCHAR, `uuid` VARCHAR, `ips` VARCHAR, `by` VARCHAR NOT NULL, `at` LONG NOT NULL, `expires` LONG, `reason` VARCHAR);");
|
||||
}
|
||||
catch (SQLException e)
|
||||
@ -85,7 +82,7 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
connection.createStatement().execute("CREATE TABLE `admins` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
|
||||
connection.createStatement().execute("CREATE TABLE `admins` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
|
||||
}
|
||||
catch (SQLException e)
|
||||
{
|
||||
@ -96,7 +93,7 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
connection.createStatement().execute("CREATE TABLE `players` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
|
||||
connection.createStatement().execute("CREATE TABLE `players` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
|
||||
}
|
||||
catch (SQLException e)
|
||||
{
|
||||
@ -136,8 +133,8 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
Object[] data = {key, admin.getUniqueId().toString()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE uuid=''{1}''", data));
|
||||
Object[] data = {key, admin.getName()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data));
|
||||
statement = setUnknownType(statement, 1, value);
|
||||
statement.executeUpdate();
|
||||
|
||||
@ -153,8 +150,8 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
Object[] data = {key, player.getUniqueId().toString()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE uuid=''{1}''", data));
|
||||
Object[] data = {key, player.getName()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE username=''{1}''", data));
|
||||
statement = setUnknownType(statement, 1, value);
|
||||
statement.executeUpdate();
|
||||
|
||||
@ -165,11 +162,9 @@ public class SQLite extends FreedomService
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public void oldUpdateAdminName(String oldName, String newName)
|
||||
public void updateAdminName(String oldName, String newName)
|
||||
{
|
||||
throw new UnsupportedOperationException("Admin no longer stores names in the object, may be changed in a future update");
|
||||
/*try
|
||||
try
|
||||
{
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName));
|
||||
statement = setUnknownType(statement, 1, newName);
|
||||
@ -179,10 +174,10 @@ public class SQLite extends FreedomService
|
||||
catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to update admin name: " + e.getMessage());
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
/*public void updatePlayerName(String oldName, String newName)
|
||||
public void updatePlayerName(String oldName, String newName)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -195,7 +190,7 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
FLog.severe("Failed to update player name: " + e.getMessage());
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
public PreparedStatement setUnknownType(PreparedStatement statement, int index, Object value) throws SQLException
|
||||
{
|
||||
@ -253,7 +248,7 @@ public class SQLite extends FreedomService
|
||||
try
|
||||
{
|
||||
PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
|
||||
statement.setString(1, admin.getUniqueId().toString());
|
||||
statement.setString(1, admin.getName());
|
||||
statement.setString(2, FUtil.listToString(admin.getIps()));
|
||||
statement.setString(3, admin.getRank().toString());
|
||||
statement.setBoolean(4, admin.isActive());
|
||||
@ -276,7 +271,7 @@ public class SQLite extends FreedomService
|
||||
try
|
||||
{
|
||||
PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
|
||||
statement.setString(1, player.getUniqueId().toString());
|
||||
statement.setString(1, player.getName());
|
||||
statement.setString(2, FUtil.listToString(player.getIps()));
|
||||
statement.setString(3, FUtil.listToString(player.getNotes()));
|
||||
statement.setString(4, player.getTag());
|
||||
@ -300,7 +295,7 @@ public class SQLite extends FreedomService
|
||||
}
|
||||
}
|
||||
|
||||
/*public ResultSet getAdminByName(String name)
|
||||
public ResultSet getAdminByName(String name)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -316,29 +311,10 @@ public class SQLite extends FreedomService
|
||||
FLog.severe(e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}*/
|
||||
|
||||
public ResultSet getAdminByUUID(UUID uuid)
|
||||
{
|
||||
try
|
||||
{
|
||||
ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE uuid=''{0}''", uuid.toString()));
|
||||
if (resultSet.next())
|
||||
{
|
||||
return resultSet;
|
||||
}
|
||||
}
|
||||
catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to get admin by name:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/*public ResultSet getPlayerByName(String name)
|
||||
public ResultSet getPlayerByName(String name)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -356,8 +332,6 @@ public class SQLite extends FreedomService
|
||||
|
||||
return null;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
public ResultSet getMasterBuilders()
|
||||
{
|
||||
@ -374,25 +348,6 @@ public class SQLite extends FreedomService
|
||||
return null;
|
||||
}
|
||||
|
||||
public ResultSet getPlayerByUUID(UUID uuid)
|
||||
{
|
||||
try
|
||||
{
|
||||
ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE uuid LIKE ''%{0}%''", uuid.toString()));
|
||||
if (resultSet.next())
|
||||
{
|
||||
return resultSet;
|
||||
}
|
||||
}
|
||||
catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to get player by uuid:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public ResultSet getPlayerByIp(String ip)
|
||||
{
|
||||
try
|
||||
@ -416,7 +371,7 @@ public class SQLite extends FreedomService
|
||||
{
|
||||
try
|
||||
{
|
||||
connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where uuid=''{0}''", admin.getUniqueId()));
|
||||
connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where name=''{0}''", admin.getName()));
|
||||
}
|
||||
catch (SQLException e)
|
||||
{
|
||||
|
||||
@ -1,18 +1,16 @@
|
||||
package me.totalfreedom.totalfreedommod.util;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.lang.WordUtils;
|
||||
import org.apache.hc.client5.http.classic.methods.HttpGet;
|
||||
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
|
||||
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
|
||||
import org.apache.hc.client5.http.impl.classic.HttpClients;
|
||||
import org.apache.hc.core5.http.HttpResponse;
|
||||
import org.apache.hc.core5.http.io.entity.EntityUtils;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Color;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -21,14 +19,12 @@ import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.json.JSONObject;
|
||||
import org.json.simple.JSONArray;
|
||||
|
||||
import java.io.*;
|
||||
import java.lang.reflect.Field;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.Instant;
|
||||
@ -41,8 +37,6 @@ import static org.bukkit.Bukkit.getServer;
|
||||
public class FUtil
|
||||
{
|
||||
|
||||
private static final Map<UUID, String> NAME_CACHE = Maps.newHashMap();
|
||||
|
||||
public static final String SAVED_FLAGS_FILENAME = "savedflags.dat";
|
||||
/* See https://github.com/TotalFreedom/License - None of the listed names may be removed.
|
||||
Leaving this list here for anyone running TFM on a cracked server:
|
||||
@ -889,52 +883,4 @@ public class FUtil
|
||||
return subList(startIndex, endIndex + 1);
|
||||
}
|
||||
}
|
||||
|
||||
public static String getNameFromUUID(UUID uuid) {
|
||||
|
||||
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
|
||||
if (player.hasPlayedBefore()) return player.getName();
|
||||
if (NAME_CACHE.containsKey(uuid)) return NAME_CACHE.get(uuid);
|
||||
|
||||
CloseableHttpClient client = HttpClients.createDefault();
|
||||
HttpGet get = new HttpGet("https://api.ashcon.app/mojang/v2/user/" + uuid.toString().replace("-", ""));
|
||||
try {
|
||||
CloseableHttpResponse response = client.execute(get);
|
||||
String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
|
||||
JSONObject obj = new JSONObject(json);
|
||||
response.close();
|
||||
if (response.getCode() == 200) {
|
||||
String name = NAME_CACHE.put(uuid, obj.getString("username"));
|
||||
|
||||
Bukkit.getScheduler().runTaskLaterAsynchronously(TotalFreedomMod.getPlugin(), () -> NAME_CACHE.remove(uuid), 20 * 60L * 5); // remove the uuid from cache as names can be changed
|
||||
return name;
|
||||
}
|
||||
client.close();
|
||||
} catch (IOException | org.apache.hc.core5.http.ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public static UUID getUUIDFromName(String name) {
|
||||
//get offline player is deprecated so we'll just see if they're online to get their uuid
|
||||
Player player = Bukkit.getPlayer(name);
|
||||
if (player != null) return player.getUniqueId();
|
||||
|
||||
CloseableHttpClient client = HttpClients.createDefault();
|
||||
HttpGet get = new HttpGet("https://api.ashcon.app/mojang/v2/user/" + name);
|
||||
try {
|
||||
CloseableHttpResponse response = client.execute(get);
|
||||
String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
|
||||
JSONObject obj = new JSONObject(json);
|
||||
response.close();
|
||||
if (response.getCode() == 200) {
|
||||
return UUID.fromString(obj.getString("uuid"));
|
||||
}
|
||||
client.close();
|
||||
} catch (IOException | org.apache.hc.core5.http.ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ public class WorldRestrictions extends FreedomService
|
||||
|
||||
public boolean doRestrict(Player player)
|
||||
{
|
||||
if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getUniqueId()))
|
||||
if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getName()))
|
||||
{
|
||||
if (player.getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user