TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 12:02:53 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup /ci addition.

Browse source
This commit is contained in:
KHobbits 2013-01-27 17:10:07 +00:00
parent c65353350f
commit 9fb42375b8
2 changed files with 71 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

175
Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
View file

@ -23,147 +23,112 @@ public class Commandclearinventory extends EssentialsCommand
{ {
if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others")) if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others"))
{ {
//TODO: Fix fringe user match case.
if (args[0].contentEquals("*") && user.isAuthorized("essentials.clearinventory.all")) if (args[0].contentEquals("*") && user.isAuthorized("essentials.clearinventory.all"))
{ {
if (args.length > 1) cleanInventoryAll(server, user, args);
{
for (Player onlinePlayer : server.getOnlinePlayers())
{
clearInventory(onlinePlayer, args[1]);
}
user.sendMessage("Cleared everyone's inventory");
}
else
{
throw new NotEnoughArgumentsException();
}
} }
else if (args[0].length() >= 3) else if (args[0].trim().length() < 2)
{ {
List<Player> online = server.matchPlayer(args[0]); cleanInventorySelf(server, user, args);
if (!online.isEmpty())
{
for (Player p : online)
{
if (args.length > 1)
{
clearInventory(p, args[1]);
}
else
{
p.getInventory().clear();
}
user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
}
}
else
{
clearInventory(user, args[0]);
user.sendMessage(_("inventoryCleared"));
}
} }
else else
{ {
Player p = server.getPlayer(args[0]); cleanInventoryOthers(server, user, args);
if (p != null)
{
clearInventory(p, args[1]);
user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
}
else
{
clearInventory(user, args[0]);
user.sendMessage(_("inventoryCleared"));
}
} }
} }
else else
{ {
if (args.length > 0) cleanInventorySelf(server, user, args);
{
clearInventory(user, args[0]);
}
else
{
user.getInventory().clear();
}
user.sendMessage(_("inventoryCleared"));
} }
} }
@Override @Override
protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
{ {
if (args.length < 1) if (args.length > 0)
{ {
throw new NotEnoughArgumentsException(); if (args[0].contentEquals("*"))
}
if (args[0].contentEquals("*"))
{
if (args.length > 1)
{ {
for (Player onlinePlayer : server.getOnlinePlayers()) cleanInventoryAll(server, sender, args);
{
clearInventory(onlinePlayer, args[1]);
}
sender.sendMessage("Cleared everyone's inventory");
} }
else else if (args[0].trim().length() < 2)
{
throw new NotEnoughArgumentsException();
}
}
else if (args[0].length() >= 3)
{
List<Player> online = server.matchPlayer(args[0]);
if (!online.isEmpty())
{
for (Player p : online)
{
if (args.length > 1)
{
clearInventory(p, args[1]);
}
else
{
p.getInventory().clear();
}
sender.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
}
}
else
{ {
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
else
{
cleanInventoryOthers(server, sender, args);
}
} }
else else
{ {
Player u = server.getPlayer(args[0]); throw new NotEnoughArgumentsException();
if (u != null)
{
clearInventory(u, args[0]);
sender.sendMessage(_("inventoryClearedOthers", u.getDisplayName()));
}
else
{
throw new Exception(_("playerNotFound"));
}
} }
} }
public void clearInventory(Player player, String arg) throws Exception private void cleanInventoryAll(Server server, CommandSender sender, String[] args) throws Exception
{
if (args.length > 1)
{
for (Player onlinePlayer : server.getOnlinePlayers())
{
clearInventory(onlinePlayer, args[1]);
}
sender.sendMessage("Cleared everyone's inventory");
}
else
{
throw new NotEnoughArgumentsException();
}
}
private void cleanInventoryOthers(Server server, CommandSender user, String[] args) throws Exception
{
List<Player> online = server.matchPlayer(args[0]);
if (!online.isEmpty())
{
for (Player p : online)
{
if (args.length > 1)
{
clearInventory(p, args[1]);
}
else
{
p.getInventory().clear();
}
user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
}
}
else
{
throw new Exception(_("playerNotFound"));
}
}
private void cleanInventorySelf(Server server, User user, String[] args) throws Exception
{
if (args.length > 0)
{
clearInventory(user, args[0]);
}
else
{
user.getInventory().clear();
}
user.sendMessage(_("inventoryCleared"));
}
private void clearInventory(Player player, String arg) throws Exception
{ {
final String[] split = arg.split(":");
if (arg.contentEquals("*")) if (arg.contentEquals("*"))
{ {
player.getInventory().clear(); player.getInventory().clear();
} }
else else
{ {
final String[] split = arg.split(":");
final ItemStack item = ess.getItemDb().get(split[0]); final ItemStack item = ess.getItemDb().get(split[0]);
final int type = item.getTypeId(); final int type = item.getTypeId();

2
Essentials/src/plugin.yml
View file

@ -61,7 +61,7 @@ commands:
aliases: [eburn] aliases: [eburn]
clearinventory: clearinventory:
description: Clear all items in your inventory. description: Clear all items in your inventory.
usage: /<command> usage: /<command> [<player> [item]]
aliases: [clear,ci,eci,clearinvent,clean,eclean,eclearinvent,eclearinventory] aliases: [clear,ci,eci,clearinvent,clean,eclean,eclearinvent,eclearinventory]
compass: compass:
description: Describes your current bearing. description: Describes your current bearing.