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

staff -> admins

Browse Source 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
This commit is contained in:
speed
2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java
View File

@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.punishments.Punishment;
import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
@ -38,23 +38,23 @@ public class Command_doom extends FreedomCommand
return true;
}
FUtil.staffAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
FUtil.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
FUtil.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED);
final String ip = player.getAddress().getAddress().getHostAddress().trim();
// Remove from admin
StaffMember staffMember = getStaffMember(player);
if (staffMember != null)
Admin admin = getAdmin(player);
if (admin != null)
{
FUtil.staffAction(sender.getName(), "Removing " + player.getName() + " from the staff list", true);
staffMember.setActive(false);
plugin.sl.save(staffMember);
plugin.sl.updateTables();
plugin.ptero.updateAccountStatus(staffMember);
FUtil.adminAction(sender.getName(), "Removing " + player.getName() + " from the admin list", true);
admin.setActive(false);
plugin.al.save(admin);
plugin.al.updateTables();
plugin.ptero.updateAccountStatus(admin);
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
{
plugin.dc.syncRoles(staffMember, plugin.pl.getData(staffMember.getName()).getDiscordID());
plugin.dc.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
}
}
@ -120,11 +120,12 @@ public class Command_doom extends FreedomCommand
public void run()
{
// message
FUtil.staffAction(sender.getName(), "Banning " + player.getName(), true);
FUtil.adminAction(sender.getName(), "Banning " + player.getName(), true);
msg(sender, player.getName() + " has been banned and IP is: " + ip);
// generate explosion
player.getWorld().createExplosion(player.getLocation(), 0F, false);;
player.getWorld().createExplosion(player.getLocation(), 0F, false);
;
// kick player
player.kickPlayer(ChatColor.RED + kickReason);
@ -133,4 +134,4 @@ public class Command_doom extends FreedomCommand
return true;
}
}
}