TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-28 17:00:35 +00:00
Code Issues Projects Releases Wiki Activity

Implemented new superadmin autoadd.

Browse source
This commit is contained in:
Steven Lawson 2011-11-03 20:12:34 -04:00
parent 1f359da0d1
commit d35baebef9
5 changed files with 34 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nbproject/project.properties
View file

@ -26,12 +26,12 @@ dist.jar=${dist.dir}/TotalFreedomMod.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.MobDisguise.jar=C:\\github\\MobDisguise\\dist\\MobDisguise.jar
file.reference.MobDisguise.jar=../MobDisguise/dist/MobDisguise.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.MobDisguise.jar}:\
${libs.Bukkit.classpath}
${libs.Bukkit.classpath}:\
${file.reference.MobDisguise.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked
javac.deprecation=false

1
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View file

@ -1,6 +1,5 @@
package me.StevenLawson.TotalFreedomMod.Listener;
import java.net.InetSocketAddress;
import java.util.Iterator;
import java.util.logging.Logger;
import java.util.regex.Pattern;

46
src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
View file

@ -271,7 +271,7 @@ public class TFM_Util
return false;
}
boolean match_found = false;
String match_ip = null;
for (String test_ip : tfm.superadmin_ips)
{
String[] test_octets = test_ip.split("\\.");
@ -279,32 +279,46 @@ public class TFM_Util
{
if (user_octets[0].equals(test_octets[0]) && user_octets[1].equals(test_octets[1]) && user_octets[2].equals(test_octets[2]))
{
log.info("New IP '" + user_ip + "' matches old IP '" + test_ip + "' via partial match, adding it to superadmin list.");
match_found = true;
match_ip = test_ip;
break;
}
}
}
if (match_found)
if (match_ip != null)
{
tfm.superadmin_ips.add(user_ip);
log.severe("TODO: Implement add to superadmin list.");
FileConfiguration config = YamlConfiguration.loadConfiguration(new File(tfm.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
// try
// {
// FileConfiguration sa_config = YamlConfiguration.loadConfiguration(new File(tfm.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
// sa_config.set("superadmin_ips", tfm.superadmin_ips);
// sa_config.save(new File(tfm.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
// }
// catch (IOException ex)
// {
// Logger.getLogger(TFM_Util.class.getName()).log(Level.SEVERE, null, ex);
// }
fileloop:
for (String user : config.getKeys(false))
{
List<String> user_ips = config.getStringList(user);
for (String ip : user_ips)
{
ip = ip.toLowerCase().trim();
if (ip.equals(match_ip))
{
log.info("New IP '" + user_ip + "' matches old IP '" + match_ip + "' via partial match, adding it to superadmin list.");
user_ips.add(user_ip);
config.set(user, user_ips);
break fileloop;
}
}
}
try
{
config.save(new File(tfm.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
}
catch (IOException ex)
{
log.log(Level.SEVERE, null, ex);
}
}
return match_found;
return match_ip != null;
}
}

35
src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
View file

@ -168,41 +168,6 @@ public class TotalFreedomMod extends JavaPlugin
public List<String> superadmins = new ArrayList<String>();
public List<String> superadmin_ips = new ArrayList<String>();
// public void loadSuperadminConfig()
// {
// TFM_Util.createDefaultConfiguration(SUPERADMIN_FILE, this, getFile());
// FileConfiguration config = YamlConfiguration.loadConfiguration(new File(getDataFolder(), SUPERADMIN_FILE));
//
// superadmins = new ArrayList<String>();
// List<String> superadmins_temp = config.getStringList("superadmins");
// if (superadmins_temp == null || superadmins_temp.isEmpty())
// {
// superadmins.add("Madgeek1450");
// superadmins.add("markbyron");
// }
// else
// {
// for (String admin_name : superadmins_temp)
// {
// superadmins.add(admin_name.toLowerCase().trim());
// }
// }
//
// superadmin_ips = new ArrayList<String>();
// List<String> superadmin_ips_temp = config.getStringList("superadmin_ips");
// if (superadmin_ips_temp == null || superadmin_ips_temp.isEmpty())
// {
// superadmin_ips.add("127.0.0.1");
// }
// else
// {
// for (String admin_ip : superadmin_ips_temp)
// {
// superadmin_ips.add(admin_ip.toLowerCase().trim());
// }
// }
// }
public void loadSuperadminConfig()
{

2
src/plugin.yml
View file

@ -1,6 +1,6 @@
name: TotalFreedomMod
main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
version: 2.1
version: 2.2
description: Plugin for the Total Freedom server.
author: StevenLawson / Madgeek1450
commands: