From 6174e4a98b48923268af8f80cdf844a74ce0a48e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 8 Feb 2014 01:23:54 +0000 Subject: Code cleanup and remove remote skull edit. --- Essentials/src/com/earth2me/essentials/User.java | 45 ++++++----- .../src/com/earth2me/essentials/UserData.java | 12 +-- .../earth2me/essentials/commands/Commandskull.java | 88 ++++++++++------------ Essentials/src/messages.properties | 8 +- Essentials/src/messages_cs.properties | 5 ++ Essentials/src/messages_da.properties | 5 ++ Essentials/src/messages_de.properties | 5 ++ Essentials/src/messages_en.properties | 5 ++ Essentials/src/messages_es.properties | 5 ++ Essentials/src/messages_fi.properties | 5 ++ Essentials/src/messages_fr.properties | 5 ++ Essentials/src/messages_hu.properties | 5 ++ Essentials/src/messages_it.properties | 5 ++ Essentials/src/messages_lt.properties | 5 ++ Essentials/src/messages_nl.properties | 5 ++ Essentials/src/messages_pl.properties | 5 ++ Essentials/src/messages_pt.properties | 5 ++ Essentials/src/messages_ro.properties | 5 ++ Essentials/src/messages_ru.properties | 5 ++ Essentials/src/messages_sv.properties | 5 ++ Essentials/src/messages_tr.properties | 5 ++ Essentials/src/messages_zh.properties | 5 ++ Essentials/src/messages_zh_HK.properties | 5 ++ Essentials/src/messages_zh_TW.properties | 5 ++ Essentials/src/plugin.yml | 8 +- 25 files changed, 178 insertions(+), 83 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 0ca5201c0..1c5312b17 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -52,9 +52,9 @@ public class User extends UserData implements Comparable, 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, 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, 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, IReplyTo, net.es suffix = "§r"; } - if (isOp()) + if (this.getBase().isOp()) { try { @@ -351,13 +351,13 @@ public class User extends UserData implements Comparable, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, IReplyTo, net.es { return new CommandSource(getBase()); } + + @Override + public String getName() + { + return this.getBase().getName(); + } } diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index f2ab37328..11cc6fc22 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -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) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandskull.java b/Essentials/src/com/earth2me/essentials/commands/Commandskull.java index eeac3c668..77d69f74d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandskull.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandskull.java @@ -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 (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")); + } - 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 (metaSkull.hasOwner() && !user.isAuthorized("essentials.skull.modify")) + { + throw new Exception(_("noPermissionSkull")); + } - skull.setOwner(args[0]); - skull.update(true); - return; - } + metaSkull.setDisplayName("§fSkull of " + owner); + metaSkull.setOwner(owner); - 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")); - } + itemSkull.setItemMeta(metaSkull); - user.sendMessage(_("skullChanged", args[0])); - user.setItemInHand(spawnSkull(args[0], cSkull.getAmount())); - } else { - throw new Exception(_("invalidSkull")); - } - } + if (spawn) { + InventoryWorkaround.addItems(user.getBase().getInventory(), itemSkull); + user.sendMessage(_("givenSkull", owner)); } - } - - private ItemStack spawnSkull(String owner, int amount) { - if (amount < 1 || amount > 64) { - amount = 1; + else { + user.sendMessage(_("skullChanged", owner)); } - 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; } + } \ No newline at end of file diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 54a5d5f98..b1539e89f 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -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. \ No newline at end of file +noPermissionSkull=\u00a74You do not have permission to modify that Skull. +invalidSkull=\u00a74Please hold a player Skull. \ No newline at end of file diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 923d77a50..de1bd53bb 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 1a857d963..340d29b05 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index d9f71892c..5fdf3654e 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 1482683a2..94a5faa8e 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 973014884..da33f47da 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 47a07c912..44157a1dd 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index ea3a6b3ec..b0a751109 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties index 616885896..6539fe25d 100644 --- a/Essentials/src/messages_hu.properties +++ b/Essentials/src/messages_hu.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 6ff83ce68..2d0cebd9d 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties index e92b7151d..40dca1ab9 100644 --- a/Essentials/src/messages_lt.properties +++ b/Essentials/src/messages_lt.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 6eb7ca033..2dbb2719e 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index d6e95a56c..d3aaa96a1 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 8401220c9..09228bc3e 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index e08f4305f..693a54e73 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 0ee1de734..0f2d44336 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 96a081577..8de8dd702 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties index 3983bb7d7..82d841a59 100644 --- a/Essentials/src/messages_tr.properties +++ b/Essentials/src/messages_tr.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index 4d92276e9..f7f1d83de 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index bd2751652..8927436e8 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index d5801b0a7..38920d684 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -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. \ No newline at end of file diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index b2c0cfe3d..bb40080d9 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -326,10 +326,6 @@ commands: description: Creates a jail where you specified named [jailname]. usage: / aliases: [esetjail,createjail,ecreatejail] - skull: - description: Give yourself or change the owner of a Skull. - usage: / [owner] - aliases: [eskull, egiveskull, giveskull] setwarp: description: Creates a new warp. usage: / @@ -338,6 +334,10 @@ commands: description: Set the sell value of an item. usage: / [itemname|id] aliases: [esetworth] + skull: + description: Set the owner of a player skull + usage: / [owner] + aliases: [eskull, playerskull, eplayerskull, head, ehead] socialspy: description: Toggles if you can see msg/mail commands in chat. usage: / [player] [on|off] -- cgit v1.2.3