Revert "forgot to pull"

This reverts commit e4c9ea656e.
This commit is contained in:
2020-08-15 17:41:26 -05:00
parent da80f1b69e
commit e77d92407c
8 changed files with 132 additions and 93 deletions

View File

@ -1,9 +1,9 @@
package me.totalfreedom.totalfreedommod.command;
import de.myzelyam.api.vanish.VanishAPI;
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;
@ -96,7 +96,7 @@ public class Command_list extends FreedomCommand
}
else
{
onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().size() - AdminList.vanished.size())
onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().size() - VanishAPI.getInvisiblePlayers().size())
.append(ChatColor.BLUE)
.append(" out of a maximum ")
.append(ChatColor.RED)
@ -109,11 +109,11 @@ public class Command_list extends FreedomCommand
{
continue;
}
if (listFilter == ListFilter.ADMINS && plugin.al.isVanished(p.getName()))
if (listFilter == ListFilter.ADMINS && plugin.al.isVanished(p))
{
continue;
}
if (listFilter == ListFilter.VANISHED_ADMINS && !plugin.al.isVanished(p.getName()))
if (listFilter == ListFilter.VANISHED_ADMINS && !plugin.al.isVanished(p))
{
continue;
}

View File

@ -0,0 +1,44 @@
package me.totalfreedom.totalfreedommod.command;
import de.myzelyam.api.vanish.VanishAPI;
import me.totalfreedom.totalfreedommod.rank.Rank;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Hide yourself from other players", usage = "/<command> [-s]", aliases = "v,ev,evanish")
public class Command_vanish extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length == 0)
{
if (!VanishAPI.isInvisible(playerSender))
{
VanishAPI.hidePlayer(playerSender);
}
else
{
VanishAPI.showPlayer(playerSender);
}
}
else if (args[0].equalsIgnoreCase("-s") || args[0].equalsIgnoreCase("-v"))
{
if (!VanishAPI.isInvisible(playerSender))
{
VanishAPI.getPlugin().getVisibilityChanger().hidePlayer(playerSender, null, true);
}
else
{
VanishAPI.getPlugin().getVisibilityChanger().showPlayer(playerSender, null, true);
}
}
else
{
return false;
}
return true;
}
}