AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-12 13:53:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.16, overhaul of player data

Browse Source
This commit is contained in:
Seth
2020-06-30 00:25:38 -07:00
parent 4ddcc3b8d7
commit eb58419a3a
95 changed files with 1553 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
View File

@ -50,7 +50,7 @@ public class Module_list extends HTTPDModule
imposters.add(player.getName());
}
if (plugin.mbl.isMasterBuilder(player))
if (plugin.pl.getData(player).isMasterBuilder())
{
masterbuilders.add(player.getName());
}
@ -146,7 +146,7 @@ public class Module_list extends HTTPDModule
public boolean isImposter(Player player)
{
if (plugin.al.isAdminImpostor(player) || plugin.pv.isPlayerImpostor(player) || plugin.mbl.isMasterBuilderImpostor(player))
if (plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player))
{
return true;
}

2
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logs.java
View File

@ -17,7 +17,7 @@ public class Module_logs extends Module_file
@Override
public NanoHTTPD.Response getResponse()
{
if (ConfigEntry.LOGS_SECRET.getString().equals(params.get("password")))
if (ConfigEntry.LOGS_SECRET.getString().equals(params.get("password")) && !ConfigEntry.LOGS_SECRET.getString().isEmpty())
{
FLog.info(session.getSocket().getInetAddress() + " is downloading latest.log.");
return serveFile("latest.log", params, new File("./logs"));

7
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
View File

@ -4,7 +4,6 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -66,11 +65,7 @@ public class Module_players extends HTTPDModule
}
}
// Master Builders
for (MasterBuilder masterBuilder : plugin.mbl.getAllMasterBuilders().values())
{
masterbuilders.add(masterBuilder.getName());
}
masterbuilders.addAll(plugin.pl.getMasterBuilderNames());
// Developers
developers.addAll(FUtil.DEVELOPERS);

6
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java
View File

@ -21,7 +21,7 @@ import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Method;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringEscapeUtils;
@ -271,8 +271,8 @@ public class Module_schematic extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
Admin adminEntry = plugin.al.getEntryByIp(remoteAddress);
MasterBuilder masterBuilderEntry = plugin.mbl.getEntryByIp(remoteAddress);
return ((adminEntry != null && adminEntry.isActive()) || masterBuilderEntry != null);
PlayerData data = plugin.pl.getDataByIp(remoteAddress);
return ((adminEntry != null && adminEntry.isActive()) || data != null && data.isMasterBuilder());
}
private static class SchematicTransferException extends Exception