Code cleanup and remove remote skull edit.

This commit is contained in:
KHobbits 2014-02-08 01:23:54 +00:00
parent 5c74af42a3
commit 6174e4a98b
25 changed files with 179 additions and 84 deletions

View File

@ -52,9 +52,9 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
teleport = new Teleport(this, ess);
if (isAfk())
{
afkPosition = getLocation();
afkPosition = this.getBase().getLocation();
}
if (isOnline())
if (this.getBase().isOnline())
{
lastOnlineActivity = System.currentTimeMillis();
}
@ -238,13 +238,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
@Override
public void setLastLocation()
{
setLastLocation(getLocation());
setLastLocation(this.getBase().getLocation());
}
@Override
public void setLogoutLocation()
{
setLogoutLocation(getLocation());
setLogoutLocation(this.getBase().getLocation());
}
@Override
@ -259,7 +259,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
}
else
{
teleportLocation = here ? player.getLocation() : this.getLocation();
teleportLocation = here ? player.getBase().getLocation() : this.getBase().getLocation();
}
}
@ -294,7 +294,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
suffix = "§r";
}
if (isOp())
if (this.getBase().isOp())
{
try
{
@ -351,13 +351,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
{
if (base.isOnline() && ess.getSettings().changeDisplayName())
{
setDisplayName(getNick(true));
this.getBase().setDisplayName(getNick(true));
if (ess.getSettings().changePlayerListName())
{
String name = getNick(false);
try
{
setPlayerListName(name);
this.getBase().setPlayerListName(name);
}
catch (IllegalArgumentException e)
{
@ -370,10 +370,9 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
}
}
@Override
public String getDisplayName()
{
return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
return super.getBase().getDisplayName() == null ? super.getBase().getName() : super.getBase().getDisplayName();
}
@Override
@ -495,10 +494,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
return;
}
this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
this.getBase().setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
if (set && !isAfk())
{
afkPosition = getLocation();
afkPosition = this.getBase().getLocation();
}
else if (!set && isAfk())
{
@ -573,10 +572,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
//Returns true if status expired during this check
public boolean checkBanTimeout(final long currentTime)
{
if (getBanTimeout() > 0 && getBanTimeout() < currentTime && isBanned())
if (getBanTimeout() > 0 && getBanTimeout() < currentTime && this.getBase().isBanned())
{
setBanTimeout(0);
setBanned(false);
this.getBase().setBanned(false);
return true;
}
return false;
@ -608,7 +607,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
{
final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0);
lastActivity = 0;
kickPlayer(kickReason);
this.getBase().kickPlayer(kickReason);
for (Player player : ess.getServer().getOnlinePlayers())
@ -644,7 +643,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
@Override
public boolean isGodModeEnabled()
{
return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(this.getBase().getLocation().getWorld().getName()))
|| (isAfk() && ess.getSettings().getFreezeAfkPlayers());
}
@ -678,7 +677,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
@Override
public boolean canBuild()
{
if (isOp())
if (this.getBase().isOp())
{
return true;
}
@ -759,7 +758,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
ess.getVanishedPlayers().add(getName());
if (isAuthorized("essentials.vanish.effect"))
{
this.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false));
this.getBase().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false));
}
}
else
@ -772,7 +771,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
ess.getVanishedPlayers().remove(getName());
if (isAuthorized("essentials.vanish.effect"))
{
this.removePotionEffect(PotionEffectType.INVISIBILITY);
this.getBase().removePotionEffect(PotionEffectType.INVISIBILITY);
}
}
}
@ -848,7 +847,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
@Override
public int compareTo(final User other)
{
return FormatUtil.stripFormat(this.getDisplayName()).compareToIgnoreCase(FormatUtil.stripFormat(other.getDisplayName()));
return FormatUtil.stripFormat(getDisplayName()).compareToIgnoreCase(FormatUtil.stripFormat(other.getDisplayName()));
}
@Override
@ -873,4 +872,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
{
return new CommandSource(getBase());
}
@Override
public String getName()
{
return this.getBase().getName();
}
}

View File

@ -37,7 +37,7 @@ public abstract class UserData extends PlayerExtension implements IConf
public final void reset()
{
config.getFile().delete();
ess.getUserMap().removeUser(this.getName());
ess.getUserMap().removeUser(this.getBase().getName());
}
@Override
@ -149,7 +149,7 @@ public abstract class UserData extends PlayerExtension implements IConf
public Location getHome(String name) throws Exception
{
String search = getHomeName(name);
return config.getLocation("homes." + search, getServer());
return config.getLocation("homes." + search, this.getBase().getServer());
}
public Location getHome(final Location world)
@ -163,14 +163,14 @@ public abstract class UserData extends PlayerExtension implements IConf
Location loc;
for (String home : getHomes())
{
loc = config.getLocation("homes." + home, getServer());
loc = config.getLocation("homes." + home, this.getBase().getServer());
if (world.getWorld() == loc.getWorld())
{
return loc;
}
}
loc = config.getLocation("homes." + getHomes().get(0), getServer());
loc = config.getLocation("homes." + getHomes().get(0), this.getBase().getServer());
return loc;
}
catch (InvalidWorldException ex)
@ -322,7 +322,7 @@ public abstract class UserData extends PlayerExtension implements IConf
{
try
{
return config.getLocation("lastlocation", getServer());
return config.getLocation("lastlocation", this.getBase().getServer());
}
catch (InvalidWorldException e)
{
@ -351,7 +351,7 @@ public abstract class UserData extends PlayerExtension implements IConf
{
try
{
return config.getLocation("logoutlocation", getServer());
return config.getLocation("logoutlocation", this.getBase().getServer());
}
catch (InvalidWorldException e)
{

View File

@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import com.earth2me.essentials.utils.LocationUtil;
import org.bukkit.Location;
@ -22,63 +23,52 @@ public class Commandskull extends EssentialsCommand
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
if (args.length < 1)
{
user.getInventory().addItem(spawnSkull(user.getName(), 1));
user.sendMessage(_("givenSkull", user.getName()));
} else {
// Alphanumeric and underscores only
String owner;
if (args.length > 0 && user.isAuthorized("essentials.skull.others")) {
if (!args[0].matches("^[A-Za-z0-9_]+$")) {
throw new IllegalArgumentException(_("invalidSkullOwner"));
throw new IllegalArgumentException(_("alphaNames"));
}
owner = args[0];
}
else {
owner = user.getName();
}
final Location target = LocationUtil.getTarget(user.getBase());
BlockState state = target.getBlock().getState();
Skull skull = null;
ItemStack itemSkull = user.getBase().getItemInHand();
SkullMeta metaSkull = null;
boolean spawn = false;
if (state instanceof Skull)
{
skull = (Skull) state;
if (skull.hasOwner() && !user.isAuthorized("essentials.skull.change"))
{
throw new Exception(_("noPermissionSkull"));
}
user.sendMessage(_("skullChanged", args[0]));
if (itemSkull != null && itemSkull.getType() == Material.SKULL_ITEM && itemSkull.getDurability() == 3) {
metaSkull = (SkullMeta) itemSkull.getItemMeta();
}
else if (user.isAuthorized("essentials.skull.spawn"))
{
itemSkull = new ItemStack(Material.SKULL_ITEM, 1, (byte) 3);
metaSkull = (SkullMeta) itemSkull.getItemMeta();
spawn = true;
}
else {
throw new Exception(_("invalidSkull"));
}
skull.setOwner(args[0]);
skull.update(true);
return;
}
if (metaSkull.hasOwner() && !user.isAuthorized("essentials.skull.modify"))
{
throw new Exception(_("noPermissionSkull"));
}
if (skull == null)
{
ItemStack cSkull = user.getItemInHand();
if (cSkull.getType() == Material.SKULL_ITEM && cSkull.getDurability() == 3) {
SkullMeta cSkullMeta = (SkullMeta) cSkull.getItemMeta();
if (cSkullMeta.hasOwner() && !user.isAuthorized("essentials.skull.change"))
{
throw new Exception(_("noPermissionSkull"));
}
metaSkull.setDisplayName("§fSkull of " + owner);
metaSkull.setOwner(owner);
user.sendMessage(_("skullChanged", args[0]));
user.setItemInHand(spawnSkull(args[0], cSkull.getAmount()));
} else {
throw new Exception(_("invalidSkull"));
}
}
itemSkull.setItemMeta(metaSkull);
if (spawn) {
InventoryWorkaround.addItems(user.getBase().getInventory(), itemSkull);
user.sendMessage(_("givenSkull", owner));
}
else {
user.sendMessage(_("skullChanged", owner));
}
}
private ItemStack spawnSkull(String owner, int amount) {
if (amount < 1 || amount > 64) {
amount = 1;
}
ItemStack skull = new ItemStack(Material.SKULL_ITEM, amount, (byte) 3);
SkullMeta skullMeta = (SkullMeta) skull.getItemMeta();
skullMeta.setDisplayName("§fSkull of " + owner);
skullMeta.setOwner(owner);
skull.setItemMeta(skullMeta);
return skull;
}
}

View File

@ -535,8 +535,8 @@ ignoreExempt=\u00a74You can not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull owner set to \u00a7c{0}.\u00a76.
invalidSkullOwner=\u00a74Skull owners names can only contain letters, numbers and underscores.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to spawn/modify that Skull.
invalidSkull=\u00a74Please hold or look at a player Skull.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Nemuzes ignorovat tohoto hrace.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Du kan ikke ignorere den spiller.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Du kannst diesen Spieler nicht ignorieren.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74You may not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74No puedes ignorar a este jugador.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74You can not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Vous ne pouvez pas ignorer ce joueur.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Nem hagyhatod figyelmen k\u00edv\u0171l ezt a j\u00e1t\u00e9
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Non puoi ignorare quel giocatore.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Tu negali ignoruoti sio zaidejo.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Je kan die speler niet negeren.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Nie mozesz ignorowac tego gracza.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74Voce nao pode ignorar aquele jogador.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74You can not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74\u0412\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u04
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74DU kan inte ignorera den spelaren.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74You can not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74\u4f60\u65e0\u6cd5\u5ffd\u7565\u90a3\u4e2a\u73a9\u5bb6.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74You can not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -535,3 +535,8 @@ ignoreExempt=\u00a74You can not ignore that player.
unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
noMetaJson=JSON Metadata is not supported in this version of Bukkit.
maxMoney=\u00a74This transaction would exceed the balance limit for this account.
skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76.
alphaNames=\u00a74Player names can only contain letters, numbers and underscores.
givenSkull=\u00a76You have been given the Skull of \u00a7c{0}\u00a76.
noPermissionSkull=\u00a74You do not have permission to modify that Skull.
invalidSkull=\u00a74Please hold a player Skull.

View File

@ -326,10 +326,6 @@ commands:
description: Creates a jail where you specified named [jailname].
usage: /<command> <jailname>
aliases: [esetjail,createjail,ecreatejail]
skull:
description: Give yourself or change the owner of a Skull.
usage: /<command> [owner]
aliases: [eskull, egiveskull, giveskull]
setwarp:
description: Creates a new warp.
usage: /<command> <warp>
@ -338,6 +334,10 @@ commands:
description: Set the sell value of an item.
usage: /<command> [itemname|id] <price>
aliases: [esetworth]
skull:
description: Set the owner of a player skull
usage: /<command> [owner]
aliases: [eskull, playerskull, eplayerskull, head, ehead]
socialspy:
description: Toggles if you can see msg/mail commands in chat.
usage: /<command> [player] [on|off]