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

Fixes for https://totalfreedom.boards.net/thread/66504/server-problems-admin-info-section (#194)

Browse Source
This commit is contained in:
Telesphoreo
2020-04-25 19:13:54 -07:00
committed by GitHub
parent c49abd1f4a
commit a2a4a8a0b8
5 changed files with 136 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java
View File

@ -2,6 +2,7 @@ package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.List;
import me.totalfreedom.totalfreedommod.admin.AdminList;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.StringUtils;
@ -13,7 +14,6 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Deop a player", usage = "/<command> <partialname>")
public class Command_deop extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
@ -33,9 +33,10 @@ public class Command_deop extends FreedomCommand
final List<String> matchedPlayerNames = new ArrayList<>();
for (final Player player : server.getOnlinePlayers())
{
if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
|| player.getName().contains(targetName) || player.getDisplayName().contains(targetName))
{
if (player.isOp() && !plugin.al.vanished.contains(player))
if (player.isOp() && !AdminList.vanished.contains(player))
{
matchedPlayerNames.add(player.getName());
player.setOp(false);
@ -53,7 +54,7 @@ public class Command_deop extends FreedomCommand
}
else
{
msg("No targets matched.");
msg("Either the player is already deopped, or the player could not be found.");
}
return true;

12
src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java
View File

@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.List;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.admin.AdminList;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.rank.Displayable;
import me.totalfreedom.totalfreedommod.rank.Rank;
@ -52,6 +53,7 @@ public class Command_list extends FreedomCommand
}
case "-t":
{
checkRank(Rank.TELNET_ADMIN);
listFilter = ListFilter.TELNET_SESSIONS;
break;
}
@ -106,11 +108,11 @@ public class Command_list extends FreedomCommand
{
continue;
}
if (listFilter == ListFilter.ADMINS && plugin.al.vanished.contains(p))
if (listFilter == ListFilter.ADMINS && AdminList.vanished.contains(p))
{
continue;
}
if (listFilter == ListFilter.VANISHED_ADMINS && !plugin.al.vanished.contains(p))
if (listFilter == ListFilter.VANISHED_ADMINS && !AdminList.vanished.contains(p))
{
continue;
}
@ -122,7 +124,7 @@ public class Command_list extends FreedomCommand
{
continue;
}
if (listFilter == ListFilter.PLAYERS && plugin.al.vanished.contains(p))
if (listFilter == ListFilter.PLAYERS && AdminList.vanished.contains(p))
{
continue;
}
@ -144,11 +146,13 @@ public class Command_list extends FreedomCommand
.append(": ")
.append(StringUtils.join(n, ChatColor.WHITE + ", "));
if (senderIsConsole)
{
sender.sendMessage(ChatColor.stripColor(onlineStats.toString()));
sender.sendMessage(ChatColor.stripColor(onlineUsers.toString()));
}
else
{
sender.sendMessage(onlineStats.toString());
sender.sendMessage(onlineUsers.toString());
@ -184,4 +188,4 @@ public class Command_list extends FreedomCommand
FAMOUS_PLAYERS,
IMPOSTORS
}
}
}

11
src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java
View File

@ -2,6 +2,7 @@ package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.List;
import me.totalfreedom.totalfreedommod.admin.AdminList;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.StringUtils;
@ -13,7 +14,6 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "OP a player", usage = "/<command> <partialname>")
public class Command_op extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
@ -30,12 +30,13 @@ public class Command_op extends FreedomCommand
final String targetName = args[0].toLowerCase();
final List<String> matchedPlayerNames = new ArrayList<>();
List<String> matchedPlayerNames = new ArrayList<>();
for (final Player player : server.getOnlinePlayers())
{
if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
|| player.getName().contains(targetName) || player.getDisplayName().contains(targetName))
{
if (!player.isOp() && !plugin.al.vanished.contains(player))
if (!player.isOp() && !AdminList.vanished.contains(player))
{
matchedPlayerNames.add(player.getName());
player.setOp(true);
@ -53,7 +54,7 @@ public class Command_op extends FreedomCommand
}
else
{
msg("No targets matched.");
msg("Either the player is already opped, or the player could not be found.");
}
return true;