AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-01 12:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many changes for TFM 5.0

Browse Source 
Improved admin system
Improved Rank system
Implemented config converter
Improved command handling
Updated Aero
This commit is contained in:
Jerom van der Sar
2016-03-06 16:56:15 +01:00
parent 055973aa37
commit 6edb6be7d9
153 changed files with 1105 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
View File

@ -1,10 +1,9 @@
package me.totalfreedom.totalfreedommod.command;
import java.util.Date;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.rank.PlayerRank;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.util.Ips;
import org.apache.commons.lang3.StringUtils;
@ -13,7 +12,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = PlayerRank.OP, source = SourceType.BOTH)
@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
@CommandParameters(description = "Manage admins.", usage = "/<command> <list | clean | clearme [ip] | <add | remove | info> <username>>")
public class Command_saconfig extends FreedomCommand
{
@ -41,7 +40,7 @@ public class Command_saconfig extends FreedomCommand
FUtil.adminAction(sender.getName(), "Cleaning admin list", true);
plugin.al.deactivateOldEntries(true);
msg("Superadmins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.YELLOW);
msg("Superadmins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);
return true;
}
@ -49,7 +48,7 @@ public class Command_saconfig extends FreedomCommand
case "clearme":
{
checkPlayer();
checkRank(PlayerRank.SUPER_ADMIN);
checkRank(Rank.SUPER_ADMIN);
final Admin admin = plugin.al.getAdmin(playerSender);
@ -107,7 +106,7 @@ public class Command_saconfig extends FreedomCommand
return false;
}
checkRank(PlayerRank.SUPER_ADMIN);
checkRank(Rank.SUPER_ADMIN);
Admin admin = plugin.al.getEntryByName(args[1]);
@ -140,7 +139,7 @@ public class Command_saconfig extends FreedomCommand
}
checkConsole();
checkRank(PlayerRank.TELNET_ADMIN);
checkRank(Rank.TELNET_ADMIN);
final Player player = getPlayer(args[1]);
@ -162,7 +161,7 @@ public class Command_saconfig extends FreedomCommand
admin.loadFrom(player); // Reset IP, username
}
admin.setActivated(true);
admin.setActive(true);
admin.setLastLogin(new Date());
plugin.al.save(admin);
plugin.al.updateTables();
@ -181,7 +180,8 @@ public class Command_saconfig extends FreedomCommand
}
if (player != null) {
if (player != null)
{
final FPlayer fPlayer = plugin.pl.getPlayer(player);
if (fPlayer.getFreezeData().isFrozen())
{
@ -201,7 +201,7 @@ public class Command_saconfig extends FreedomCommand
}
checkConsole();
checkRank(PlayerRank.TELNET_ADMIN);
checkRank(Rank.TELNET_ADMIN);
Player player = getPlayer(args[1]);
Admin admin = player == null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]);