mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-10 20:29:28 +00:00
Merge pull request #22 from okamosy/master
Adding hidden players to tpo/unlimited update
This commit is contained in:
commit
81d7be4f77
|
@ -1,5 +1,6 @@
|
||||||
package com.earth2me.essentials.commands;
|
package com.earth2me.essentials.commands;
|
||||||
|
|
||||||
|
import com.earth2me.essentials.OfflinePlayer;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
import com.earth2me.essentials.Util;
|
import com.earth2me.essentials.Util;
|
||||||
|
@ -21,9 +22,23 @@ public class Commandtpo extends EssentialsCommand
|
||||||
}
|
}
|
||||||
|
|
||||||
//Just basically the old tp command
|
//Just basically the old tp command
|
||||||
User p = getPlayer(server, args, 0);
|
User p = getPlayer(server, args, 0, true);
|
||||||
charge(user);
|
// Check if user is offline
|
||||||
user.getTeleport().now(p, false);
|
if (p.getBase() instanceof OfflinePlayer)
|
||||||
user.sendMessage(Util.i18n("teleporting"));
|
{
|
||||||
|
throw new NoSuchFieldException(Util.i18n("playerNotFound"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify permission
|
||||||
|
if (!p.isHidden() || user.isAuthorized("essentials.teleport.hidden"))
|
||||||
|
{
|
||||||
|
charge(user);
|
||||||
|
user.getTeleport().now(p, false);
|
||||||
|
user.sendMessage(Util.i18n("teleporting"));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new NoSuchFieldException(Util.i18n("playerNotFound"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.earth2me.essentials.commands;
|
package com.earth2me.essentials.commands;
|
||||||
|
|
||||||
|
import com.earth2me.essentials.OfflinePlayer;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
import com.earth2me.essentials.Util;
|
import com.earth2me.essentials.Util;
|
||||||
|
@ -21,9 +22,24 @@ public class Commandtpohere extends EssentialsCommand
|
||||||
}
|
}
|
||||||
|
|
||||||
//Just basically the old tphere command
|
//Just basically the old tphere command
|
||||||
User p = getPlayer(server, args, 0);
|
User p = getPlayer(server, args, 0, true);
|
||||||
charge(user);
|
|
||||||
p.getTeleport().now(user, false);
|
// Check if user is offline
|
||||||
user.sendMessage(Util.i18n("teleporting"));
|
if (p.getBase() instanceof OfflinePlayer)
|
||||||
|
{
|
||||||
|
throw new NoSuchFieldException(Util.i18n("playerNotFound"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify permission
|
||||||
|
if (!p.isHidden() || user.isAuthorized("essentials.teleport.hidden"))
|
||||||
|
{
|
||||||
|
charge(user);
|
||||||
|
p.getTeleport().now(user, false);
|
||||||
|
user.sendMessage(Util.i18n("teleporting"));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new NoSuchFieldException(Util.i18n("playerNotFound"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,63 +33,90 @@ public class Commandunlimited extends EssentialsCommand
|
||||||
|
|
||||||
if (args[0].equalsIgnoreCase("list"))
|
if (args[0].equalsIgnoreCase("list"))
|
||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
String list = getList(target);
|
||||||
sb.append(Util.i18n("unlimitedItems")).append(" ");
|
user.sendMessage(list);
|
||||||
boolean first = true;
|
}
|
||||||
List<Integer> items = target.getUnlimited();
|
else if (args[0].equalsIgnoreCase("clear"))
|
||||||
if (items.isEmpty())
|
{
|
||||||
|
List<Integer> itemList = target.getUnlimited();
|
||||||
|
|
||||||
|
int index = 0;
|
||||||
|
while (itemList.size() > index)
|
||||||
{
|
{
|
||||||
sb.append(Util.i18n("none"));
|
Integer item = itemList.get(index);
|
||||||
}
|
if (toggleUnlimited(user, target, item.toString()) == false)
|
||||||
for (Integer integer : items)
|
|
||||||
{
|
|
||||||
if (!first)
|
|
||||||
{
|
{
|
||||||
sb.append(", ");
|
index++;
|
||||||
}
|
}
|
||||||
first = false;
|
|
||||||
String matname = Material.getMaterial(integer).toString().toLowerCase().replace("_", "");
|
|
||||||
sb.append(matname);
|
|
||||||
}
|
}
|
||||||
user.sendMessage(sb.toString());
|
}
|
||||||
return;
|
else
|
||||||
|
{
|
||||||
|
toggleUnlimited(user, target, args[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getList(User target)
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append(Util.i18n("unlimitedItems")).append(" ");
|
||||||
|
boolean first = true;
|
||||||
|
List<Integer> items = target.getUnlimited();
|
||||||
|
if (items.isEmpty())
|
||||||
|
{
|
||||||
|
sb.append(Util.i18n("none"));
|
||||||
|
}
|
||||||
|
for (Integer integer : items)
|
||||||
|
{
|
||||||
|
if (!first)
|
||||||
|
{
|
||||||
|
sb.append(", ");
|
||||||
|
}
|
||||||
|
first = false;
|
||||||
|
String matname = Material.getMaterial(integer).toString().toLowerCase().replace("_", "");
|
||||||
|
sb.append(matname);
|
||||||
}
|
}
|
||||||
|
|
||||||
final ItemStack stack = ess.getItemDb().get(args[0], 1);
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Boolean toggleUnlimited(User user, User target, String item) throws Exception
|
||||||
|
{
|
||||||
|
ItemStack stack = ess.getItemDb().get(item, 1);
|
||||||
stack.setAmount(Math.min(stack.getType().getMaxStackSize(), 2));
|
stack.setAmount(Math.min(stack.getType().getMaxStackSize(), 2));
|
||||||
|
|
||||||
String itemname = stack.getType().toString().toLowerCase().replace("_", "");
|
String itemname = stack.getType().toString().toLowerCase().replace("_", "");
|
||||||
if (!user.isAuthorized("essentials.unlimited.item-all")
|
if (ess.getSettings().permissionBasedItemSpawn()
|
||||||
&& !user.isAuthorized("essentials.unlimited.item-" + itemname)
|
&& (!user.isAuthorized("essentials.unlimited.item-all")
|
||||||
&& !user.isAuthorized("essentials.unlimited.item-" + stack.getTypeId())
|
&& !user.isAuthorized("essentials.unlimited.item-" + itemname)
|
||||||
&& !((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET)
|
&& !user.isAuthorized("essentials.unlimited.item-" + stack.getTypeId())
|
||||||
&& user.isAuthorized("essentials.unlimited.item-bucket")))
|
&& !((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET)
|
||||||
|
&& user.isAuthorized("essentials.unlimited.item-bucket"))))
|
||||||
{
|
{
|
||||||
user.sendMessage(Util.format("unlimitedItemPermission", itemname));
|
user.sendMessage(Util.format("unlimitedItemPermission", itemname));
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String message = "disableUnlimited";
|
||||||
if (target.hasUnlimited(stack))
|
Boolean enableUnlimited = false;
|
||||||
|
if (!target.hasUnlimited(stack))
|
||||||
{
|
{
|
||||||
if (user != target)
|
message = "enableUnlimited";
|
||||||
|
enableUnlimited = true;
|
||||||
|
charge(user);
|
||||||
|
if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack))
|
||||||
{
|
{
|
||||||
user.sendMessage(Util.format("disableUnlimited", itemname, target.getDisplayName()));
|
target.getInventory().addItem(stack);
|
||||||
}
|
}
|
||||||
target.sendMessage(Util.format("disableUnlimited", itemname, target.getDisplayName()));
|
|
||||||
target.setUnlimited(stack, false);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
charge(user);
|
|
||||||
if (user != target)
|
if (user != target)
|
||||||
{
|
{
|
||||||
user.sendMessage(Util.format("enableUnlimited", itemname, target.getDisplayName()));
|
user.sendMessage(Util.format(message, itemname, target.getDisplayName()));
|
||||||
}
|
}
|
||||||
target.sendMessage(Util.format("enableUnlimited", itemname, target.getDisplayName()));
|
target.sendMessage(Util.format(message, itemname, target.getDisplayName()));
|
||||||
if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack))
|
target.setUnlimited(stack, enableUnlimited);
|
||||||
{
|
|
||||||
target.getInventory().addItem(stack);
|
return true;
|
||||||
}
|
|
||||||
target.setUnlimited(stack, true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue