summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/DescParseTickFormat.java34
-rw-r--r--Essentials/src/com/earth2me/essentials/Enchantments.java48
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java49
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsConf.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java44
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java195
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsTimer.java31
-rw-r--r--Essentials/src/com/earth2me/essentials/IEssentials.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/ISettings.java18
-rw-r--r--Essentials/src/com/earth2me/essentials/IUser.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/Jails.java30
-rw-r--r--Essentials/src/com/earth2me/essentials/Kit.java65
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java85
-rw-r--r--Essentials/src/com/earth2me/essentials/Teleport.java44
-rw-r--r--Essentials/src/com/earth2me/essentials/Trade.java21
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java144
-rw-r--r--Essentials/src/com/earth2me/essentials/UserData.java46
-rw-r--r--Essentials/src/com/earth2me/essentials/Util.java28
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandback.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandban.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java3
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandessentials.java9
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandexp.java143
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandfly.java30
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java26
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandgc.java16
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandgive.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandgod.java38
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandhat.java63
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandhome.java19
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandignore.java7
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commanditem.java65
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java12
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandjump.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkick.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkickall.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkill.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkillall.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkit.java66
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandlightning.java26
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmail.java3
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmsg.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmute.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandpay.java8
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java28
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandptime.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandr.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandremove.java15
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandrepair.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandseen.java23
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsethome.java8
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java3
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtempban.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtime.java18
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtpa.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtpo.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtppos.java27
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandunban.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandvanish.java43
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandwhois.java39
-rw-r--r--Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java36
-rw-r--r--Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java52
-rw-r--r--Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/metrics/Metrics.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java17
-rw-r--r--Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/Method.java7
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java14
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java81
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignEnchant.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java17
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignTrade.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/user/UserBase.java7
-rw-r--r--Essentials/src/config.yml33
-rw-r--r--Essentials/src/items.csv756
-rw-r--r--Essentials/src/messages.properties69
-rw-r--r--Essentials/src/messages_cs.properties447
-rw-r--r--Essentials/src/messages_da.properties55
-rw-r--r--Essentials/src/messages_de.properties57
-rw-r--r--Essentials/src/messages_en.properties77
-rw-r--r--Essentials/src/messages_es.properties55
-rw-r--r--Essentials/src/messages_fi.properties438
-rw-r--r--Essentials/src/messages_fr.properties55
-rw-r--r--Essentials/src/messages_it.properties444
-rw-r--r--Essentials/src/messages_nl.properties333
-rw-r--r--Essentials/src/messages_pl.properties444
-rw-r--r--Essentials/src/messages_pt.properties444
-rw-r--r--Essentials/src/plugin.yml29
-rw-r--r--Essentials/test/com/earth2me/essentials/FakeServer.java18
-rw-r--r--Essentials/test/com/earth2me/essentials/UtilTest.java82
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java13
-rw-r--r--EssentialsChat/src/plugin.yml2
-rw-r--r--EssentialsGroupManager/src/globalgroups.yml25
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java2
-rw-r--r--EssentialsSpawn/src/plugin.yml4
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java3
-rw-r--r--lib/bukkit.jarbin4715521 -> 4716391 bytes
-rw-r--r--lib/craftbukkit.jarbin11093197 -> 11592470 bytes
112 files changed, 5010 insertions, 936 deletions
diff --git a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
index bf3037e59..9c40acacc 100644
--- a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
+++ b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
@@ -6,12 +6,11 @@ import java.util.*;
/**
- * This utility class is used for converting between the ingame
- * time in ticks to ingame time as a friendly string.
- * Note that the time is INGAME.
- *
+ * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
+ * that the time is INGAME.
+ *
* http://www.minecraftwiki.net/wiki/Day/night_cycle
- *
+ *
* @author Olof Larsson
*/
public final class DescParseTickFormat
@@ -156,30 +155,31 @@ public final class DescParseTickFormat
int hours = 0;
int minutes = 0;
- desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
+ desc = desc.toLowerCase(Locale.ENGLISH);
+ String parsetime = desc.replaceAll("[^0-9]", "");
- if (desc.length() > 4)
+ if (parsetime.length() > 4)
{
throw new NumberFormatException();
}
- if (desc.length() == 4)
+ if (parsetime.length() == 4)
{
- hours += Integer.parseInt(desc.substring(0, 2));
- minutes += Integer.parseInt(desc.substring(2, 4));
+ hours += Integer.parseInt(parsetime.substring(0, 2));
+ minutes += Integer.parseInt(parsetime.substring(2, 4));
}
- else if (desc.length() == 3)
+ else if (parsetime.length() == 3)
{
- hours += Integer.parseInt(desc.substring(0, 1));
- minutes += Integer.parseInt(desc.substring(1, 3));
+ hours += Integer.parseInt(parsetime.substring(0, 1));
+ minutes += Integer.parseInt(parsetime.substring(1, 3));
}
- else if (desc.length() == 2)
+ else if (parsetime.length() == 2)
{
- hours += Integer.parseInt(desc.substring(0, 2));
+ hours += Integer.parseInt(parsetime.substring(0, 2));
}
- else if (desc.length() == 1)
+ else if (parsetime.length() == 1)
{
- hours += Integer.parseInt(desc.substring(0, 1));
+ hours += Integer.parseInt(parsetime.substring(0, 1));
}
else
{
diff --git a/Essentials/src/com/earth2me/essentials/Enchantments.java b/Essentials/src/com/earth2me/essentials/Enchantments.java
index 5ce10d75d..060dfd2c1 100644
--- a/Essentials/src/com/earth2me/essentials/Enchantments.java
+++ b/Essentials/src/com/earth2me/essentials/Enchantments.java
@@ -19,47 +19,93 @@ public class Enchantments
ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
+ ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
+
ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
+ ENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
+ ENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
+
ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
+
ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
+ ENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
+ ENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);
+
ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
+
ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
+ ENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
+ ENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);
+
ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
+
ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
+
ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
+
ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
+ ENCHANTMENTS.put("breathing", Enchantment.OXYGEN);
+ ENCHANTMENTS.put("breath", Enchantment.OXYGEN);
+
ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
+ ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);
+
ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
+ ENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
+ ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS);
+
ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
+ ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
+
ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
- ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
+ ENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
+ ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
+ ENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
+
ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
+
ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
+ ENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);
+
ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
+
ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
+ ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE);
+ ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE);
+
ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
+ ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
+ ENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);
+
ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
+ ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
+ ENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
+
ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
+ ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
+ ENCHANTMENTS.put("infinite", Enchantment.ARROW_INFINITE);
+ ENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE);
+ ENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE);
}
public static Enchantment getByName(String name) {
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index c3dac9b50..8790e7022 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -42,6 +42,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.World;
@@ -66,7 +67,7 @@ import org.yaml.snakeyaml.error.YAMLException;
public class Essentials extends JavaPlugin implements IEssentials
{
- public static final int BUKKIT_VERSION = 2122;
+ public static final int BUKKIT_VERSION = 2149;
private static final Logger LOGGER = Logger.getLogger("Minecraft");
private transient ISettings settings;
private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
@@ -83,6 +84,8 @@ public class Essentials extends JavaPlugin implements IEssentials
private transient ExecuteTimer execTimer;
private transient I18n i18n;
private transient Metrics metrics;
+ private transient EssentialsTimer timer;
+ private transient List<String> vanishedPlayers = new ArrayList<String>();
@Override
public ISettings getSettings()
@@ -237,11 +240,12 @@ public class Essentials extends JavaPlugin implements IEssentials
pm.registerEvents(tntListener, this);
- final EssentialsTimer timer = new EssentialsTimer(this);
- getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
+ timer = new EssentialsTimer(this);
+ getScheduler().scheduleSyncRepeatingTask(this, timer, 100, 100);
+
Economy.setEss(this);
execTimer.mark("RegListeners");
-
+
final MetricsStarter metricsStarter = new MetricsStarter(this);
if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
{
@@ -263,6 +267,15 @@ public class Essentials extends JavaPlugin implements IEssentials
@Override
public void onDisable()
{
+ for (Player p : getServer().getOnlinePlayers())
+ {
+ User user = getUser(p);
+ if (user.isVanished())
+ {
+ user.toggleVanished();
+ p.sendMessage(_("unvanishedReload"));
+ }
+ }
i18n.onDisable();
Economy.setEss(null);
Trade.closeLog();
@@ -304,20 +317,7 @@ public class Essentials extends JavaPlugin implements IEssentials
}
catch (final Exception ex)
{
- final ArrayList<StackTraceElement> elements = new ArrayList<StackTraceElement>(Arrays.asList(ex.getStackTrace()));
- elements.remove(0);
- final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>();
- for (final StackTraceElement e : elements)
- {
- if (e.getClassName().equals("com.earth2me.essentials.Essentials"))
- {
- toRemove.add(e);
- }
- }
- elements.removeAll(toRemove);
- final StackTraceElement[] trace = elements.toArray(new StackTraceElement[elements.size()]);
- ex.setStackTrace(trace);
- ex.printStackTrace();
+ Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
return true;
}
@@ -557,7 +557,7 @@ public class Essentials extends JavaPlugin implements IEssentials
for (Player player : players)
{
final User user = getUser(player);
- if (!user.isIgnoredPlayer(sender.getName()))
+ if (!user.isIgnoredPlayer(sender))
{
player.sendMessage(message);
}
@@ -626,6 +626,17 @@ public class Essentials extends JavaPlugin implements IEssentials
return i18n;
}
+ @Override
+ public EssentialsTimer getTimer()
+ {
+ return timer;
+ }
+
+ @Override
+ public List<String> getVanishedPlayers()
+ {
+ return vanishedPlayers;
+ }
private static class EssentialsWorldListener implements Listener, Runnable
{
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index 17f0f1778..0c6bec0fe 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -17,17 +17,17 @@ public class EssentialsBlockListener implements Listener
this.ess = ess;
}
- @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockPlace(final BlockPlaceEvent event)
{
- final User user = ess.getUser(event.getPlayer());
// Do not rely on getItemInHand();
- // http://leaky.bukkit.org/issues/663
+ // http://leaky.bukkit.org/issues/663
final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
if (is == null)
{
return;
}
+ final User user = ess.getUser(event.getPlayer());
final boolean unlimitedForUser = user.hasUnlimited(is);
if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
{
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
index 85c2bbd8c..b2cb1fd12 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@@ -39,7 +39,7 @@ public class EssentialsConf extends YamlConfiguration
this.configFile = configFile;
}
- public void load()
+ public synchronized void load()
{
configFile = configFile.getAbsoluteFile();
if (!configFile.getParentFile().exists())
@@ -356,7 +356,7 @@ public class EssentialsConf extends YamlConfiguration
}
@Override
- public void save(final File file) throws IOException
+ public synchronized void save(final File file) throws IOException
{
if (file == null)
{
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
index 029288530..19cfde0f4 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
@@ -3,14 +3,14 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import java.util.List;
import org.bukkit.Material;
-import org.bukkit.entity.Animals;
+import org.bukkit.entity.Ageable;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.inventory.ItemStack;
@@ -23,7 +23,7 @@ public class EssentialsEntityListener implements Listener
this.ess = ess;
}
- @EventHandler(priority = EventPriority.LOWEST)
+ @EventHandler(priority = EventPriority.LOW)
public void onEntityDamage(final EntityDamageByEntityEvent event)
{
final Entity eAttack = event.getDamager();
@@ -32,31 +32,49 @@ public class EssentialsEntityListener implements Listener
{
final User defender = ess.getUser(eDefend);
final User attacker = ess.getUser(eAttack);
- if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport()) {
+
+ if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
+ && (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
+ {
event.setCancelled(true);
}
+
+ if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
+ {
+ event.setCancelled(true);
+ }
+
attacker.updateActivity(true);
final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
if (commandList != null && !commandList.isEmpty())
{
- for (String command : commandList)
+ for (final String command : commandList)
{
if (command != null && !command.isEmpty())
{
- attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
+ ess.scheduleSyncDelayedTask(
+ new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
+ }
+ });
+
event.setCancelled(true);
return;
}
}
}
}
- else if (eDefend instanceof Animals && eAttack instanceof Player)
+ else if (eDefend instanceof Ageable && eAttack instanceof Player)
{
- final User player = ess.getUser(eAttack);
+ final Player player = (Player)eAttack;
final ItemStack hand = player.getItemInHand();
if (hand != null && hand.getType() == Material.MILK_BUCKET)
{
- ((Animals)eDefend).setAge(-24000);
+ ((Ageable)eDefend).setBaby();
hand.setType(Material.BUCKET);
player.setItemInHand(hand);
player.updateInventory();
@@ -65,7 +83,7 @@ public class EssentialsEntityListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityDamage(final EntityDamageEvent event)
{
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
@@ -77,7 +95,7 @@ public class EssentialsEntityListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityCombust(final EntityCombustEvent event)
{
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
@@ -101,7 +119,7 @@ public class EssentialsEntityListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onFoodLevelChange(final FoodLevelChangeEvent event)
{
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
@@ -110,7 +128,7 @@ public class EssentialsEntityListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityRegainHealth(final EntityRegainHealthEvent event)
{
if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 36adf37e2..369eb3808 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -14,7 +14,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Location;
import org.bukkit.Material;
-import org.bukkit.Server;
+import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@@ -25,19 +25,20 @@ import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.event.player.*;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
public class EssentialsPlayerListener implements Listener
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private final transient Server server;
private final transient IEssentials ess;
+ private static final int AIR = Material.AIR.getId();
+ private static final int BED = Material.BED_BLOCK.getId();
public EssentialsPlayerListener(final IEssentials parent)
{
this.ess = parent;
- this.server = parent.getServer();
}
@EventHandler(priority = EventPriority.NORMAL)
@@ -62,7 +63,7 @@ public class EssentialsPlayerListener implements Listener
while (it.hasNext())
{
final User u = ess.getUser(it.next());
- if (u.isIgnoredPlayer(user.getName()))
+ if (u.isIgnoredPlayer(user))
{
it.remove();
}
@@ -74,15 +75,15 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerMove(final PlayerMoveEvent event)
{
- if (event.getFrom().getBlockX() == event.getTo().getBlockX()
- && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
- && event.getFrom().getBlockY() == event.getTo().getBlockY())
+ if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
+ || event.getFrom().getBlockX() == event.getTo().getBlockX()
+ && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+ && event.getFrom().getBlockY() == event.getTo().getBlockY())
{
return;
}
final User user = ess.getUser(event.getPlayer());
-
if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
{
final Location from = event.getFrom();
@@ -100,7 +101,6 @@ public class EssentialsPlayerListener implements Listener
}
return;
}
-
final Location afk = user.getAfkPosition();
if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
{
@@ -114,8 +114,13 @@ public class EssentialsPlayerListener implements Listener
final User user = ess.getUser(event.getPlayer());
if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
{
- user.toggleGodModeEnabled();
+ user.setGodModeEnabled(false);
+ }
+ if (user.isVanished())
+ {
+ user.toggleVanished();
}
+ user.setLastLocation();
user.updateActivity(false);
user.dispose();
}
@@ -123,14 +128,37 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(final PlayerJoinEvent event)
{
- ess.getBackup().onPlayerJoin();
- final User user = ess.getUser(event.getPlayer());
+ ess.scheduleAsyncDelayedTask(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ delayedJoin(event.getPlayer());
+ }
+ });
+ }
+ public void delayedJoin(final Player player)
+ {
+ if (!player.isOnline())
+ {
+ return;
+ }
+ ess.getBackup().onPlayerJoin();
+ final User user = ess.getUser(player);
user.setDisplayNick();
+ updateCompass(user);
user.setLastLogin(System.currentTimeMillis());
-
user.updateActivity(false);
- updateCompass(user);
+
+ for (String p : ess.getVanishedPlayers())
+ {
+ if (!user.isAuthorized("essentials.vanish.see"))
+ {
+ user.hidePlayer(ess.getUser(p).getBase());
+ }
+ }
+
if (user.isAuthorized("essentials.sleepingignored"))
{
user.setSleepingIgnored(true);
@@ -172,6 +200,27 @@ public class EssentialsPlayerListener implements Listener
}
}
+ private void updateCompass(final User user)
+ {
+ Location loc = user.getHome(user.getLocation());
+ if (loc == null)
+ {
+ loc = user.getBedSpawnLocation();
+ }
+ if (loc != null)
+ {
+ final Location updateLoc = loc;
+ ess.scheduleSyncDelayedTask(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ user.setCompassTarget(updateLoc);
+ }
+ });
+ }
+ }
+
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerLogin(final PlayerLoginEvent event)
{
@@ -185,7 +234,7 @@ public class EssentialsPlayerListener implements Listener
return;
}
- User user = ess.getUser(event.getPlayer());
+ final User user = ess.getUser(event.getPlayer());
if (user.isNPC())
{
user.setNPC(false);
@@ -211,30 +260,24 @@ public class EssentialsPlayerListener implements Listener
event.allow();
}
- private void updateCompass(final User user)
- {
- Location loc = user.getHome(user.getLocation());
- if (loc == null)
- {
- loc = user.getBedSpawnLocation();
- }
- if (loc != null)
- {
- user.setCompassTarget(loc);
- }
- }
-
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerTeleport(final PlayerTeleportEvent event)
{
- //TODO: Don't fetch user unless one of these features are enabled.
- final User user = ess.getUser(event.getPlayer());
- //There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
- if ((event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND) && ess.getSettings().registerBackInListener())
+ final boolean backListener = ess.getSettings().registerBackInListener();
+ final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
+ if (backListener || teleportInvulnerability)
{
- user.setLastLocation();
+ final User user = ess.getUser(event.getPlayer());
+ //There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
+ if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
+ {
+ user.setLastLocation();
+ }
+ if (teleportInvulnerability)
+ {
+ user.enableInvulnerabilityAfterTeleport();
+ }
}
- user.enableInvulnerabilityAfterTeleport();
}
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -266,26 +309,27 @@ public class EssentialsPlayerListener implements Listener
});
}
}
+ private final static List<String> COMMANDS = Arrays.asList("msg", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email");
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
{
- final User user = ess.getUser(event.getPlayer());
+ final Player player = event.getPlayer();
final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
- final List<String> commands = Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email");
- if (commands.contains(cmd))
+ if (COMMANDS.contains(cmd))
{
- for (Player player : ess.getServer().getOnlinePlayers())
+ for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
{
- final User spyer = ess.getUser(player);
- if (spyer.isSocialSpyEnabled() && !user.equals(spyer))
+ final User spyer = ess.getUser(onlinePlayer);
+ if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
{
- player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
+ onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
}
}
}
- if (!cmd.equalsIgnoreCase("afk"))
+ else if (!cmd.equalsIgnoreCase("afk"))
{
+ final User user = ess.getUser(player);
user.updateActivity(true);
}
}
@@ -294,40 +338,42 @@ public class EssentialsPlayerListener implements Listener
public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
{
final User user = ess.getUser(event.getPlayer());
+ final String newWorld = event.getPlayer().getLocation().getWorld().getName();
user.setDisplayNick();
updateCompass(user);
+ if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
+ {
+ user.sendMessage(_("noGodWorldWarning"));
+ }
- if (ess.getSettings().getNoGodWorlds().contains(event.getPlayer().getLocation().getWorld().getName()))
+ if (!event.getPlayer().getWorld().getName().equals(newWorld))
{
- if (user.isGodModeEnabledRaw())
- {
- user.sendMessage(_("noGodWorldWarning"));
- }
+ user.sendMessage(_("currentWorld", newWorld));
}
}
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerInteract(final PlayerInteractEvent event)
{
- final User user = ess.getUser(event.getPlayer());
- user.updateActivity(true);
switch (event.getAction())
{
case RIGHT_CLICK_BLOCK:
- if (event.isCancelled())
- {
- return;
- }
- if (event.getClickedBlock().getType() == Material.BED_BLOCK && ess.getSettings().getUpdateBedAtDaytime())
+ if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime())
{
- event.getPlayer().setBedSpawnLocation(event.getClickedBlock().getLocation());
+ Player player = event.getPlayer();
+ player.setBedSpawnLocation(event.getClickedBlock().getLocation());
+ player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
}
break;
- case LEFT_CLICK_BLOCK:
case LEFT_CLICK_AIR:
- if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem()))
+ case LEFT_CLICK_BLOCK:
+ if (event.getItem() != null && event.getItem().getTypeId() != AIR)
{
- event.setCancelled(true);
+ final User user = ess.getUser(event.getPlayer());
+ if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
+ {
+ event.setCancelled(true);
+ }
}
break;
default:
@@ -335,13 +381,8 @@ public class EssentialsPlayerListener implements Listener
}
}
- private boolean usePowertools(final User user, final ItemStack is)
+ private boolean usePowertools(final User user, final int id)
{
- int id;
- if (is == null || (id = is.getTypeId()) == 0)
- {
- return false;
- }
final List<String> commandList = user.getPowertool(id);
if (commandList == null || commandList.isEmpty())
{
@@ -351,9 +392,8 @@ public class EssentialsPlayerListener implements Listener
// We need to loop through each command and execute
for (final String command : commandList)
{
- if (command.matches(".*\\{player\\}.*"))
+ if (command.contains("{player}"))
{
- //user.sendMessage("Click a player to use this command");
continue;
}
else if (command.startsWith("c:"))
@@ -381,14 +421,12 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerPickupItem(final PlayerPickupItemEvent event)
{
- if (!ess.getSettings().getDisableItemPickupWhileAfk())
+ if (ess.getSettings().getDisableItemPickupWhileAfk())
{
- return;
- }
- final User user = ess.getUser(event.getPlayer());
- if (user.isAfk())
- {
- event.setCancelled(true);
+ if (ess.getUser(event.getPlayer()).isAfk())
+ {
+ event.setCancelled(true);
+ }
}
}
@@ -398,9 +436,16 @@ public class EssentialsPlayerListener implements Listener
if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
{
final User user = ess.getUser(event.getWhoClicked());
- if (user.isInvSee() && !user.isAuthorized("essentials.invsee.modify"))
+ final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
+ if (invHolder != null && invHolder instanceof HumanEntity)
{
- event.setCancelled(true);
+ final User invOwner = ess.getUser((HumanEntity)invHolder);
+ if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
+ || invOwner.isAuthorized("essentials.invsee.preventmodify")
+ || !invOwner.isOnline()))
+ {
+ event.setCancelled(true);
+ }
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
index 11f42e701..2ec8538ca 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
@@ -24,7 +24,7 @@ public class EssentialsPluginListener implements Listener, IConf
ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
{
- ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+ ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
}
}
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
index 18f980a62..95cf77521 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
@@ -2,6 +2,7 @@ package com.earth2me.essentials;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.Set;
import java.util.logging.Level;
import org.bukkit.entity.Player;
@@ -11,6 +12,8 @@ public class EssentialsTimer implements Runnable
{
private final transient IEssentials ess;
private final transient Set<User> onlineUsers = new HashSet<User>();
+ private transient long lastPoll = System.currentTimeMillis();
+ private final transient LinkedList<Float> history = new LinkedList<Float>();
EssentialsTimer(final IEssentials ess)
{
@@ -21,6 +24,21 @@ public class EssentialsTimer implements Runnable
public void run()
{
final long currentTime = System.currentTimeMillis();
+ long timeSpent = (currentTime - lastPoll) / 1000;
+ if (timeSpent == 0)
+ {
+ timeSpent = 1;
+ }
+ if (history.size() > 10)
+ {
+ history.remove();
+ }
+ float tps = 100f / timeSpent;
+ if (tps <= 20)
+ {
+ history.add(tps);
+ }
+ lastPoll = currentTime;
for (Player player : ess.getServer().getOnlinePlayers())
{
try
@@ -51,4 +69,17 @@ public class EssentialsTimer implements Runnable
user.resetInvulnerabilityAfterTeleport();
}
}
+
+ public float getAverageTPS()
+ {
+ float avg = 0;
+ for (Float f : history)
+ {
+ if (f != null)
+ {
+ avg += f;
+ }
+ }
+ return avg / history.size();
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/IEssentials.java b/Essentials/src/com/earth2me/essentials/IEssentials.java
index 83c2e7325..f12798db3 100644
--- a/Essentials/src/com/earth2me/essentials/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/IEssentials.java
@@ -4,6 +4,7 @@ import com.earth2me.essentials.api.IJails;
import com.earth2me.essentials.metrics.Metrics;
import com.earth2me.essentials.perm.PermissionsHandler;
import com.earth2me.essentials.register.payment.Methods;
+import java.util.List;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -71,4 +72,7 @@ public interface IEssentials extends Plugin
void setMetrics(Metrics metrics);
+ EssentialsTimer getTimer();
+
+ List<String> getVanishedPlayers();
}
diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java
index 74942640e..71fc7f5dd 100644
--- a/Essentials/src/com/earth2me/essentials/ISettings.java
+++ b/Essentials/src/com/earth2me/essentials/ISettings.java
@@ -127,7 +127,7 @@ public interface ISettings extends IConf
boolean removeGodOnDisconnect();
boolean changeDisplayName();
-
+
boolean changePlayerListName();
boolean isPlayerCommand(String string);
@@ -146,6 +146,8 @@ public interface ISettings extends IConf
boolean getFreezeAfkPlayers();
+ boolean cancelAfkOnMove();
+
boolean areDeathMessagesEnabled();
public void setDebug(boolean debug);
@@ -157,6 +159,8 @@ public interface ISettings extends IConf
boolean getRepairEnchanted();
boolean isWorldTeleportPermissions();
+
+ boolean isWorldHomePermissions();
boolean registerBackInListener();
@@ -165,10 +169,16 @@ public interface ISettings extends IConf
EventPriority getRespawnPriority();
long getTpaAcceptCancellation();
-
+
boolean isMetricsEnabled();
-
+
void setMetricsEnabled(boolean metricsEnabled);
- public long getTeleportInvulnerability();
+ long getTeleportInvulnerability();
+
+ boolean isTeleportInvulnerability();
+
+ long getLoginAttackDelay();
+
+ int getSignUsePerSecond();
}
diff --git a/Essentials/src/com/earth2me/essentials/IUser.java b/Essentials/src/com/earth2me/essentials/IUser.java
index df5401886..bfa9ed146 100644
--- a/Essentials/src/com/earth2me/essentials/IUser.java
+++ b/Essentials/src/com/earth2me/essentials/IUser.java
@@ -1,10 +1,8 @@
package com.earth2me.essentials;
import com.earth2me.essentials.commands.IEssentialsCommand;
-import java.net.InetSocketAddress;
import org.bukkit.Location;
import org.bukkit.entity.Player;
-import org.bukkit.inventory.PlayerInventory;
/**
diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/com/earth2me/essentials/Jails.java
index 00c9d8999..0aa90e08c 100644
--- a/Essentials/src/com/earth2me/essentials/Jails.java
+++ b/Essentials/src/com/earth2me/essentials/Jails.java
@@ -9,12 +9,16 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
@@ -38,10 +42,8 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
{
enabled = true;
final PluginManager pluginManager = ess.getServer().getPluginManager();
- final JailBlockListener blockListener = new JailBlockListener();
- final JailPlayerListener playerListener = new JailPlayerListener();
+ final JailListener blockListener = new JailListener();
pluginManager.registerEvents(blockListener, ess);
- pluginManager.registerEvents(playerListener, ess);
}
@Override
@@ -179,7 +181,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
}
- private class JailBlockListener implements Listener
+ private class JailListener implements Listener
{
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockBreak(final BlockBreakEvent event)
@@ -210,11 +212,25 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
event.setCancelled(true);
}
}
- }
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+ public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
+ {
+ if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
+ {
+ return;
+ }
+ final Entity damager = event.getDamager();
+ if (damager.getType() == EntityType.PLAYER)
+ {
+ final User user = ess.getUser(damager);
+ if (user != null && user.isJailed())
+ {
+ event.setCancelled(true);
+ }
+ }
+ }
- private class JailPlayerListener implements Listener
- {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerInteract(final PlayerInteractEvent event)
{
diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java
index 36a2e60b0..5a907beb3 100644
--- a/Essentials/src/com/earth2me/essentials/Kit.java
+++ b/Essentials/src/com/earth2me/essentials/Kit.java
@@ -5,6 +5,7 @@ import static com.earth2me.essentials.I18n.capitalCase;
import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import java.util.*;
+import java.util.logging.Level;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.enchantments.Enchantment;
@@ -22,7 +23,7 @@ public class Kit
final StringBuilder list = new StringBuilder();
for (String kiteItem : kits.getKeys(false))
{
- if (user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
+ if (user == null || user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
{
list.append(" ").append(capitalCase(kiteItem));
}
@@ -31,33 +32,42 @@ public class Kit
}
catch (Exception ex)
{
- throw new Exception(_("kitError"));
+ throw new Exception(_("kitError"), ex);
}
}
public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws NoChargeException
{
- final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
- final Calendar c = new GregorianCalendar();
- c.add(Calendar.SECOND, -(int)delay);
- c.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+ final Calendar time = new GregorianCalendar();
- final long mintime = c.getTimeInMillis();
+ // Take the current time, and remove the delay from it.
+ final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
+ final Calendar earliestTime = new GregorianCalendar();
+ earliestTime.add(Calendar.SECOND, -(int)delay);
+ earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+ // This value contains the most recent time a kit could have been used that would allow another use.
+ final long earliestLong = earliestTime.getTimeInMillis();
+ // When was the last kit used?
final Long lastTime = user.getKitTimestamp(kitName);
- if (lastTime == null || lastTime < mintime)
+
+ if (lastTime == null || lastTime < earliestLong)
+ {
+ user.setKitTimestamp(kitName, time.getTimeInMillis());
+ }
+ else if (lastTime > time.getTimeInMillis())
{
- final Calendar now = new GregorianCalendar();
- user.setKitTimestamp(kitName, now.getTimeInMillis());
+ // This is to make sure time didn't get messed up on last kit use.
+ // If this happens, let's give the user the benifit of the doubt.
+ user.setKitTimestamp(kitName, time.getTimeInMillis());
}
else
{
- final Calendar future = new GregorianCalendar();
- future.setTimeInMillis(lastTime);
- future.add(Calendar.SECOND, (int)delay);
- future.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
- user.sendMessage(_("kitTimed", Util.formatDateDiff(future.getTimeInMillis())));
+ time.setTimeInMillis(lastTime);
+ time.add(Calendar.SECOND, (int)delay);
+ time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+ user.sendMessage(_("kitTimed", Util.formatDateDiff(time.getTimeInMillis())));
throw new NoChargeException();
}
}
@@ -76,7 +86,7 @@ public class Kit
catch (Exception e)
{
user.sendMessage(_("kitError2"));
- throw new Exception(_("kitErrorHelp"));
+ throw new Exception(_("kitErrorHelp"), e);
}
}
@@ -104,6 +114,10 @@ public class Kit
continue;
}
final Enchantment enchantment = Enchantments.getByName(split[0]);
+ if (enchantment == null)
+ {
+ throw new Exception("Enchantment not found: " + split[0]);
+ }
int level;
if (split.length > 1)
{
@@ -113,7 +127,14 @@ public class Kit
{
level = enchantment.getMaxLevel();
}
- stack.addEnchantment(enchantment, level);
+ try
+ {
+ stack.addEnchantment(enchantment, level);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
+ }
}
}
@@ -141,7 +162,15 @@ public class Kit
catch (Exception e)
{
user.updateInventory();
- throw new Exception(_("kitError2"));
+ if (ess.getSettings().isDebug())
+ {
+ ess.getLogger().log(Level.WARNING, e.getMessage());
+ }
+ else
+ {
+ ess.getLogger().log(Level.WARNING, e.getMessage());
+ }
+ throw new Exception(_("kitError2"), e);
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 9dee4e990..ec317dbfd 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -382,7 +382,14 @@ public class Settings implements ISettings
config.load();
noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
enabledSigns = _getEnabledSigns();
+ teleportInvulnerability = _isTeleportInvulnerability();
+ disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
+ registerBackInListener = _registerBackInListener();
+ cancelAfkOnMove = _cancelAfkOnMove();
+ getFreezeAfkPlayers = _getFreezeAfkPlayers();
itemSpawnBl = _getItemSpawnBlacklist();
+ loginAttackDelay = _getLoginAttackDelay();
+ signUsePerSecond = _getSignUsePerSecond();
kits = _getKits();
chatFormats.clear();
}
@@ -651,12 +658,30 @@ public class Settings implements ISettings
{
return config.getLong("auto-afk-kick", -1);
}
+ private boolean getFreezeAfkPlayers;
@Override
public boolean getFreezeAfkPlayers()
{
+ return getFreezeAfkPlayers;
+ }
+
+ private boolean _getFreezeAfkPlayers()
+ {
return config.getBoolean("freeze-afk-players", false);
}
+ private boolean cancelAfkOnMove;
+
+ @Override
+ public boolean cancelAfkOnMove()
+ {
+ return cancelAfkOnMove;
+ }
+
+ private boolean _cancelAfkOnMove()
+ {
+ return config.getBoolean("cancel-afk-on-move", true);
+ }
@Override
public boolean areDeathMessagesEnabled()
@@ -688,17 +713,35 @@ public class Settings implements ISettings
{
return config.getBoolean("world-teleport-permissions", false);
}
+
+ @Override
+ public boolean isWorldHomePermissions()
+ {
+ return config.getBoolean("world-home-permissions", false);
+ }
+ private boolean registerBackInListener;
@Override
public boolean registerBackInListener()
{
+ return registerBackInListener;
+ }
+
+ private boolean _registerBackInListener()
+ {
return config.getBoolean("register-back-in-listener", false);
}
+ private boolean disableItemPickupWhileAfk;
@Override
public boolean getDisableItemPickupWhileAfk()
{
- return config.getBoolean("disable-item-pickup-while-afk", true);
+ return disableItemPickupWhileAfk;
+ }
+
+ private boolean _getDisableItemPickupWhileAfk()
+ {
+ return config.getBoolean("disable-item-pickup-while-afk", false);
}
@Override
@@ -745,10 +788,50 @@ public class Settings implements ISettings
{
this.metricsEnabled = metricsEnabled;
}
+ private boolean teleportInvulnerability;
@Override
public long getTeleportInvulnerability()
{
return config.getLong("teleport-invulnerability", 0) * 1000;
}
+
+ private boolean _isTeleportInvulnerability()
+ {
+ return (config.getLong("teleport-invulnerability", 0) > 0);
+ }
+
+ @Override
+ public boolean isTeleportInvulnerability()
+ {
+ return teleportInvulnerability;
+ }
+
+ private long loginAttackDelay;
+
+ private long _getLoginAttackDelay()
+ {
+ return config.getLong("login-attack-delay", 0) * 1000;
+ }
+
+ @Override
+ public long getLoginAttackDelay()
+ {
+ return loginAttackDelay;
+ }
+
+ private int signUsePerSecond;
+
+ private int _getSignUsePerSecond()
+ {
+ final int perSec = config.getInt("sign-use-per-second", 4);
+ return perSec > 0 ? perSec : 1;
+ }
+
+ @Override
+ public int getSignUsePerSecond()
+ {
+ return signUsePerSecond;
+ }
+
}
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index 9c21ffc6d..63ff59644 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -2,7 +2,6 @@ package com.earth2me.essentials;
import com.earth2me.essentials.api.ITeleport;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.logging.Logger;
@@ -146,23 +145,39 @@ public class Teleport implements Runnable, ITeleport
public void cooldown(boolean check) throws Exception
{
- Calendar now = new GregorianCalendar();
+ final Calendar time = new GregorianCalendar();
if (user.getLastTeleportTimestamp() > 0)
{
- double cooldown = ess.getSettings().getTeleportCooldown();
- Calendar cooldownTime = new GregorianCalendar();
- cooldownTime.setTimeInMillis(user.getLastTeleportTimestamp());
- cooldownTime.add(Calendar.SECOND, (int)cooldown);
- cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
- if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+ // Take the current time, and remove the delay from it.
+ final double cooldown = ess.getSettings().getTeleportCooldown();
+ final Calendar earliestTime = new GregorianCalendar();
+ earliestTime.add(Calendar.SECOND, -(int)cooldown);
+ earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
+ // This value contains the most recent time a teleport could have been used that would allow another use.
+ final long earliestLong = earliestTime.getTimeInMillis();
+
+ // When was the last teleport used?
+ final Long lastTime = user.getLastTeleportTimestamp();
+
+ if (lastTime > time.getTimeInMillis())
{
- throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+ // This is to make sure time didn't get messed up on last kit use.
+ // If this happens, let's give the user the benifit of the doubt.
+ user.setLastTeleportTimestamp(time.getTimeInMillis());
+ return;
+ }
+ else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+ {
+ time.setTimeInMillis(lastTime);
+ time.add(Calendar.SECOND, (int)cooldown);
+ time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+ throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
}
}
// if justCheck is set, don't update lastTeleport; we're just checking
if (!check)
{
- user.setLastTeleportTimestamp(now.getTimeInMillis());
+ user.setLastTeleportTimestamp(time.getTimeInMillis());
}
}
@@ -190,7 +205,7 @@ public class Teleport implements Runnable, ITeleport
{
cancel(false);
}
-
+
public void teleport(Location loc, Trade chargeFor) throws Exception
{
teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
@@ -278,13 +293,8 @@ public class Teleport implements Runnable, ITeleport
now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
}
- public void home(IUser user, String home, Trade chargeFor) throws Exception
+ public void home(Location loc, Trade chargeFor) throws Exception
{
- final Location loc = user.getHome(home);
- if (loc == null)
- {
- throw new NotEnoughArgumentsException();
- }
teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
}
}
diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java
index 730037d9a..3d3f36d8c 100644
--- a/Essentials/src/com/earth2me/essentials/Trade.java
+++ b/Essentials/src/com/earth2me/essentials/Trade.java
@@ -20,6 +20,7 @@ import org.bukkit.inventory.ItemStack;
public class Trade
{
private final transient String command;
+ private final transient String fallbackCommand;
private final transient Double money;
private final transient ItemStack itemStack;
private final transient Integer exp;
@@ -27,27 +28,33 @@ public class Trade
public Trade(final String command, final IEssentials ess)
{
- this(command, null, null, null, ess);
+ this(command, null, null, null, null, ess);
+ }
+
+ public Trade(final String command, final String fallback, final IEssentials ess)
+ {
+ this(command, fallback, null, null, null, ess);
}
public Trade(final double money, final IEssentials ess)
{
- this(null, money, null, null, ess);
+ this(null, null, money, null, null, ess);
}
public Trade(final ItemStack items, final IEssentials ess)
{
- this(null, null, items, null, ess);
+ this(null, null, null, items, null, ess);
}
public Trade(final int exp, final IEssentials ess)
{
- this(null, null, null, exp, ess);
+ this(null, null, null, null, exp, ess);
}
- private Trade(final String command, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
+ private Trade(final String command, final String fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
{
this.command = command;
+ this.fallbackCommand = fallback;
this.money = money;
this.itemStack = item;
this.exp = exp;
@@ -197,6 +204,10 @@ public class Trade
&& !user.isAuthorized("essentials.nocommandcost." + command))
{
cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+ if (cost == 0.0 && fallbackCommand != null && !fallbackCommand.isEmpty())
+ {
+ cost = ess.getSettings().getCommandCost(fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand);
+ }
}
return cost;
}
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index f931b07d9..e2cdc2b80 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -17,9 +17,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
private CommandSender replyTo = null;
private transient User teleportRequester;
private transient boolean teleportRequestHere;
+ private transient boolean vanished;
private transient final Teleport teleport;
private transient long teleportRequestTime;
private transient long lastOnlineActivity;
+ private transient long lastThrottledAction;
private transient long lastActivity = System.currentTimeMillis();
private boolean hidden = false;
private transient Location afkPosition = null;
@@ -164,6 +166,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
}
}
+ @Override
public boolean canAfford(final double cost)
{
return canAfford(cost, true);
@@ -262,75 +265,80 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
return teleportRequestHere;
}
- public String getNick(final boolean addprefixsuffix)
+ public String getNick(final boolean longnick)
{
- final StringBuilder nickname = new StringBuilder();
+ final StringBuilder prefix = new StringBuilder();
+ String nickname;
+ String suffix = "";
final String nick = getNickname();
if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
{
- nickname.append(getName());
+ nickname = getName();
}
else
{
- nickname.append(ess.getSettings().getNicknamePrefix()).append(nick);
+ nickname = ess.getSettings().getNicknamePrefix() + nick;
}
- if (addprefixsuffix && isOp())
+ if (isOp())
{
try
{
final String opPrefix = ess.getSettings().getOperatorColor().toString();
if (opPrefix.length() > 0)
{
- nickname.insert(0, opPrefix);
- nickname.append("ยงf");
+ prefix.insert(0, opPrefix);
+ suffix = "ยงf";
}
}
catch (Exception e)
{
}
}
- if (addprefixsuffix && ess.getSettings().addPrefixSuffix())
+
+ if (ess.getSettings().addPrefixSuffix())
{
if (!ess.getSettings().disablePrefix())
{
- final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', 'ยง');
- nickname.insert(0, prefix);
+ final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', 'ยง');
+ prefix.insert(0, ptext);
+ suffix = "ยงf";
}
if (!ess.getSettings().disableSuffix())
{
- final String suffix = ess.getPermissionsHandler().getSuffix(base).replace('&', 'ยง');
- nickname.append(suffix);
- if (suffix.length() < 2 || suffix.charAt(suffix.length() - 2) != 'ยง')
- {
- nickname.append("ยงf");
- }
- }
- else
- {
- nickname.append("ยงf");
+ final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', 'ยง');
+ suffix = stext + "ยงf";
+ suffix = suffix.replace("ยงfยงf", "ยงf");
}
}
-
- return nickname.toString();
+ final String strPrefix = prefix.toString();
+ String output = strPrefix + nickname + suffix;
+ if (!longnick && output.length() > 16)
+ {
+ output = strPrefix + nickname;
+ }
+ if (!longnick && output.length() > 16)
+ {
+ output = Util.lastCode(strPrefix) + nickname;
+ }
+ if (!longnick && output.length() > 16)
+ {
+ output = Util.lastCode(strPrefix) + nickname.substring(0, 14);
+ }
+ if (output.charAt(output.length() - 1) == 'ยง') {
+ output = output.substring(0, output.length() - 1);
+ }
+ return output;
}
public void setDisplayNick()
{
if (base.isOnline() && ess.getSettings().changeDisplayName())
{
- String name = getNick(true);
- setDisplayName(name);
- if (name.length() > 16)
- {
- name = getNick(false);
- }
- if (name.length() > 16)
- {
- name = Util.stripFormat(name);
- }
+ setDisplayName(getNick(true));
if (ess.getSettings().changePlayerListName())
{
+ String name = getNick(false);
try
{
setPlayerListName(name);
@@ -453,6 +461,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
public void setHidden(final boolean hidden)
{
this.hidden = hidden;
+ if (hidden == true)
+ {
+ setLastLogout(getLastOnlineActivity());
+ }
}
//Returns true if status expired during this check
@@ -553,16 +565,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
}
@Override
- public boolean toggleGodModeEnabled()
- {
- if (!isGodModeEnabled())
- {
- setFoodLevel(20);
- }
- return super.toggleGodModeEnabled();
- }
-
- @Override
public boolean isGodModeEnabled()
{
return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
@@ -574,6 +576,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
return super.isGodModeEnabled();
}
+ @Override
public String getGroup()
{
return ess.getPermissionsHandler().getGroup(base);
@@ -626,9 +629,64 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
teleportInvulnerabilityTimestamp = 0;
}
}
-
+
public boolean hasInvulnerabilityAfterTeleport()
{
return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
}
+
+ public boolean isVanished()
+ {
+ return vanished;
+ }
+
+ public void setVanished(final boolean set)
+ {
+ vanished = set;
+ if (set)
+ {
+ for (Player p : ess.getServer().getOnlinePlayers())
+ {
+ if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
+ {
+ p.hidePlayer(getBase());
+ }
+ }
+ setHidden(true);
+ ess.getVanishedPlayers().add(getName());
+ }
+ else
+ {
+ for (Player p : ess.getServer().getOnlinePlayers())
+ {
+ p.showPlayer(getBase());
+ }
+ setHidden(false);
+ ess.getVanishedPlayers().remove(getName());
+ }
+ }
+
+ public void toggleVanished()
+ {
+ final boolean set = !vanished;
+ }
+
+ public boolean checkSignThrottle() {
+ if (isSignThrottled()) {
+ return true;
+ }
+ updateThrottle();
+ return false;
+ }
+
+ public boolean isSignThrottled()
+ {
+ final long minTime = lastThrottledAction + (1000 / ess.getSettings().getSignUsePerSecond());
+ return (System.currentTimeMillis() < minTime);
+ }
+
+ public void updateThrottle()
+ {
+ lastThrottledAction = System.currentTimeMillis();;
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java
index abf338470..7dd9ebf97 100644
--- a/Essentials/src/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/UserData.java
@@ -3,9 +3,7 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import java.io.File;
import java.util.*;
-import java.util.logging.Logger;
import org.bukkit.Location;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -14,7 +12,6 @@ public abstract class UserData extends PlayerExtension implements IConf
{
protected final transient IEssentials ess;
private final EssentialsConf config;
- private static final Logger logger = Logger.getLogger("Minecraft");
protected UserData(Player base, IEssentials ess)
{
@@ -149,7 +146,7 @@ public abstract class UserData extends PlayerExtension implements IConf
public List<String> getHomes()
{
- return new ArrayList(homes.keySet());
+ return new ArrayList<String>(homes.keySet());
}
public void setHome(String name, Location loc)
@@ -254,11 +251,13 @@ public abstract class UserData extends PlayerExtension implements IConf
config.save();
}
+ @SuppressWarnings("unchecked")
public List<String> getPowertool(ItemStack stack)
{
return (List<String>)powertools.get("" + stack.getTypeId());
}
+ @SuppressWarnings("unchecked")
public List<String> getPowertool(int id)
{
return (List<String>)powertools.get("" + id);
@@ -459,20 +458,31 @@ public abstract class UserData extends PlayerExtension implements IConf
config.save();
}
- public boolean isIgnoredPlayer(String name)
+ @Deprecated
+ public boolean isIgnoredPlayer(final String userName)
{
- return ignoredPlayers.contains(name.toLowerCase(Locale.ENGLISH));
+ final IUser user = ess.getUser(userName);
+ if (user == null || !user.isOnline())
+ {
+ return false;
+ }
+ return isIgnoredPlayer(user);
}
- public void setIgnoredPlayer(String name, boolean set)
+ public boolean isIgnoredPlayer(IUser user)
+ {
+ return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isAuthorized("essentials.chat.ignoreexempt"));
+ }
+
+ public void setIgnoredPlayer(IUser user, boolean set)
{
if (set)
{
- ignoredPlayers.add(name.toLowerCase(Locale.ENGLISH));
+ ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
}
else
{
- ignoredPlayers.remove(name.toLowerCase(Locale.ENGLISH));
+ ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
}
setIgnoredPlayers(ignoredPlayers);
}
@@ -494,16 +504,9 @@ public abstract class UserData extends PlayerExtension implements IConf
config.setProperty("godmode", set);
config.save();
}
-
- public boolean toggleGodModeEnabled()
- {
- boolean ret = !isGodModeEnabled();
- setGodModeEnabled(ret);
- return ret;
- }
private boolean muted;
- private boolean getMuted()
+ public boolean getMuted()
{
return config.getBoolean("muted", false);
}
@@ -519,13 +522,6 @@ public abstract class UserData extends PlayerExtension implements IConf
config.setProperty("muted", set);
config.save();
}
-
- public boolean toggleMuted()
- {
- boolean ret = !isMuted();
- setMuted(ret);
- return ret;
- }
private long muteTimeout;
private long _getMuteTimeout()
@@ -595,7 +591,7 @@ public abstract class UserData extends PlayerExtension implements IConf
public void setBanReason(String reason)
{
- config.setProperty("ban.reason", reason);
+ config.setProperty("ban.reason", Util.sanitizeString(reason));
config.save();
}
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 510ab8a9a..112477ecb 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -80,11 +80,17 @@ public class Util
_("second"),
_("seconds")
};
+ int accuracy = 0;
for (int i = 0; i < types.length; i++)
{
+ if (accuracy > 2)
+ {
+ break;
+ }
int diff = dateDiff(types[i], fromDate, toDate, future);
if (diff > 0)
{
+ accuracy++;
sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
}
}
@@ -92,7 +98,7 @@ public class Util
{
return "now";
}
- return sb.toString();
+ return sb.toString().trim();
}
private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
@@ -209,6 +215,12 @@ public class Util
{
c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
}
+
+ Calendar max = new GregorianCalendar();
+ max.add(Calendar.YEAR, 10);
+ if (c.after(max)) {
+ return max.getTimeInMillis();
+ }
return c.getTimeInMillis();
}
// The player can stand inside these materials
@@ -242,6 +254,7 @@ public class Util
AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
+ AIR_MATERIALS.add(Material.SNOW.getId());
AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
@@ -249,8 +262,10 @@ public class Util
AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
AIR_MATERIALS.add(Material.MELON_STEM.getId());
AIR_MATERIALS.add(Material.VINE.getId());
- AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
+ AIR_MATERIALS.add(Material.FENCE_GATE.getId());
AIR_MATERIALS.add(Material.WATER_LILY.getId());
+ AIR_MATERIALS.add(Material.NETHER_FENCE.getId());
+ AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
for (Integer integer : AIR_MATERIALS)
{
@@ -495,6 +510,15 @@ public class Util
}
return buf.toString();
}
+
+ public static String lastCode(final String input) {
+ int pos = input.lastIndexOf("ยง");
+ if (pos == -1 || (pos + 1) == input.length()) {
+ return "";
+ }
+ return input.substring(pos, pos + 2);
+ }
+
private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]");
private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/com/earth2me/essentials/commands/Commandback.java
index 2ad39ceea..d2ed98e69 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandback.java
@@ -16,6 +16,11 @@ public class Commandback extends EssentialsCommand
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
+ if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions()
+ && !user.isAuthorized("essentials.world." + user.getLastLocation().getWorld().getName()))
+ {
+ throw new Exception(_("noPerm", "essentials.world." + user.getLastLocation().getWorld().getName()));
+ }
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
user.sendMessage(_("backUsageMsg"));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
index bc09cbba8..01e8ab5b3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
@@ -40,20 +40,21 @@ public class Commandban extends EssentialsCommand
return;
}
}
-
+
+ final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
String banReason;
if (args.length > 1)
{
- banReason = getFinalArg(args, 1);
- user.setBanReason(banReason);
+ banReason = _("banFormat", getFinalArg(args, 1), senderName);
}
else
{
- banReason = _("defaultBanReason");
+ banReason = _("banFormat", _("defaultBanReason"), senderName);
}
+
+ user.setBanReason(banReason);
user.setBanned(true);
user.kickPlayer(banReason);
- final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
for (Player onlinePlayer : server.getOnlinePlayers())
{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
index 95bb967c6..e6eeda28b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
@@ -1,6 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
@@ -20,6 +21,6 @@ public class Commandbroadcast extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- ess.broadcastMessage(null, _("broadcast", getFinalArg(args, 0)));
+ ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
index 6b248f6d5..2a89dcd42 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
@@ -57,7 +57,7 @@ public class Commandessentials extends EssentialsCommand
{
sender.sendMessage("Essentials " + ess.getDescription().getVersion());
sender.sendMessage("/<command> <reload/debug>");
- sender.sendMessage(_("blockList"));
+
final StringBuilder disabledCommands = new StringBuilder();
for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet())
{
@@ -66,7 +66,10 @@ public class Commandessentials extends EssentialsCommand
}
disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
}
- sender.sendMessage(disabledCommands.toString());
+ if (disabledCommands.length() > 0) {
+ sender.sendMessage(_("blockList"));
+ sender.sendMessage(disabledCommands.toString());
+ }
}
private void run_debug(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
@@ -125,7 +128,7 @@ public class Commandessentials extends EssentialsCommand
if (loc.getBlock().getTypeId() == 0)
{
noteBlocks.put(player, loc.getBlock());
- player.sendBlockChange(loc, Material.NOTE_BLOCK, (byte)0);
+ loc.getBlock().setType(Material.NOTE_BLOCK);
}
}
taskid = ess.scheduleSyncRepeatingTask(new Runnable()
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandexp.java b/Essentials/src/com/earth2me/essentials/commands/Commandexp.java
new file mode 100644
index 000000000..de4727fa0
--- /dev/null
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandexp.java
@@ -0,0 +1,143 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandexp extends EssentialsCommand
+{
+ public Commandexp()
+ {
+ super("exp");
+ }
+
+ @Override
+ public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length == 0)
+ {
+ showExp(user, user);
+ }
+ else if (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
+ {
+ if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
+ {
+ expMatch(server, user, args[1], args[2], false);
+ }
+ else
+ {
+ setExp(user, user, args[1], false);
+ }
+ }
+ else if (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))
+ {
+ if (args.length == 3 && user.isAuthorized("essentials.exp.give.others"))
+ {
+ expMatch(server, user, args[1], args[2], true);
+ }
+ else
+ {
+ setExp(user, user, args[1], true);
+ }
+ }
+ else
+ {
+ String match = args[0].trim();
+ if (args.length == 2)
+ {
+ match = args[1].trim();
+ }
+ if (match.equalsIgnoreCase("show") || !user.isAuthorized("essentials.exp.others"))
+ {
+ showExp(user, user);
+ }
+ else
+ {
+ showMatch(server, user, match);
+ }
+ }
+ }
+
+ @Override
+ public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length < 1)
+ {
+ throw new NotEnoughArgumentsException();
+ }
+ else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
+ {
+ expMatch(server, sender, args[1], args[2], false);
+ }
+ else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
+ {
+ expMatch(server, sender, args[1], args[2], true);
+ }
+ else
+ {
+ String match = args[0].trim();
+ if (args.length == 2)
+ {
+ match = args[1].trim();
+ }
+ showMatch(server, sender, match);
+ }
+ }
+
+ private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
+ {
+ boolean foundUser = false;
+ for (Player matchPlayer : server.matchPlayer(match))
+ {
+ foundUser = true;
+ final User target = ess.getUser(matchPlayer);
+ showExp(sender, target);
+ }
+ if (!foundUser)
+ {
+ throw new NotEnoughArgumentsException(_("playerNotFound"));
+ }
+ }
+
+ private void expMatch(final Server server, final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
+ {
+ boolean foundUser = false;
+ for (Player matchPlayer : server.matchPlayer(match))
+ {
+ final User target = ess.getUser(matchPlayer);
+ setExp(sender, target, amount, toggle);
+ foundUser = true;
+ }
+ if (!foundUser)
+ {
+ throw new NotEnoughArgumentsException(_("playerNotFound"));
+ }
+ }
+
+ private void showExp(final CommandSender sender, final User target)
+ {
+ final int totalExp = SetExpFix.getTotalExperience(target);
+ final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
+ sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
+ }
+
+ private void setExp(final CommandSender sender, final User target, final String strAmount, final boolean give)
+ {
+ Long amount = Long.parseLong(strAmount);
+ if (give)
+ {
+ amount += SetExpFix.getTotalExperience(target);
+ }
+ if (amount > Integer.MAX_VALUE)
+ {
+ amount = (long)Integer.MAX_VALUE;
+ }
+ SetExpFix.setTotalExperience(target, amount.intValue());
+ sender.sendMessage(_("expSet", target.getDisplayName(), amount));
+ }
+}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java b/Essentials/src/com/earth2me/essentials/commands/Commandfly.java
index 526fc090d..86347d3e9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfly.java
@@ -2,8 +2,6 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
-import java.util.Locale;
-import org.bukkit.GameMode;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -24,15 +22,15 @@ public class Commandfly extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- flyOtherPlayers(server, sender, args[0]);
+ flyOtherPlayers(server, sender, args);
}
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
- if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.fly.others"))
+ if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.fly.others"))
{
- flyOtherPlayers(server, user, args[0]);
+ flyOtherPlayers(server, user, args);
return;
}
user.setAllowFlight(!user.getAllowFlight());
@@ -43,16 +41,32 @@ public class Commandfly extends EssentialsCommand
user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
}
- private void flyOtherPlayers(final Server server, final CommandSender sender, final String name)
+ private void flyOtherPlayers(final Server server, final CommandSender sender, final String[] args)
{
- for (Player matchPlayer : server.matchPlayer(name))
+ for (Player matchPlayer : server.matchPlayer(args[0]))
{
final User player = ess.getUser(matchPlayer);
if (player.isHidden())
{
continue;
}
- player.setAllowFlight(!player.getAllowFlight());
+
+ if (args.length > 1)
+ {
+ if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
+ {
+ player.setAllowFlight(true);
+ }
+ else
+ {
+ player.setAllowFlight(false);
+ }
+ }
+ else
+ {
+ player.setAllowFlight(!player.getAllowFlight());
+ }
+
if (!player.getAllowFlight())
{
player.setFlying(false);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
index 62ace9357..5fdc69d68 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
@@ -24,15 +24,15 @@ public class Commandgamemode extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- gamemodeOtherPlayers(server, sender, args[0]);
+ gamemodeOtherPlayers(server, sender, args);
}
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
- if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.gamemode.others"))
+ if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
{
- gamemodeOtherPlayers(server, user, args[0]);
+ gamemodeOtherPlayers(server, user, args);
return;
}
@@ -40,9 +40,9 @@ public class Commandgamemode extends EssentialsCommand
user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
}
- private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final String name)
+ private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final String[] args)
{
- for (Player matchPlayer : server.matchPlayer(name))
+ for (Player matchPlayer : server.matchPlayer(args[0]))
{
final User player = ess.getUser(matchPlayer);
if (player.isHidden())
@@ -50,7 +50,21 @@ public class Commandgamemode extends EssentialsCommand
continue;
}
- player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
+ if (args.length > 1)
+ {
+ if (args[1].contains("creat") || args[1].equalsIgnoreCase("1"))
+ {
+ player.setGameMode(GameMode.CREATIVE);
+ }
+ else
+ {
+ player.setGameMode(GameMode.SURVIVAL);
+ }
+ }
+ else
+ {
+ player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
+ }
sender.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java b/Essentials/src/com/earth2me/essentials/commands/Commandgc.java
index 9429bc5a8..d9b08b50f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgc.java
@@ -1,6 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
+import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
@@ -16,6 +17,21 @@ public class Commandgc extends EssentialsCommand
@Override
protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
+ float tps = ess.getTimer().getAverageTPS();
+ ChatColor color;
+ if (tps >= 18)
+ {
+ color = ChatColor.GREEN;
+ }
+ else if (tps >= 15)
+ {
+ color = ChatColor.YELLOW;
+ }
+ else
+ {
+ color = ChatColor.RED;
+ }
+ sender.sendMessage(_("tps", "" + color + tps));
sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
index 701fa6577..21903e98b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
import java.util.Locale;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@@ -44,7 +45,12 @@ public class Commandgive extends EssentialsCommand
final User giveTo = getPlayer(server, args, 0);
- if (args.length > 2 && Integer.parseInt(args[2]) > 0)
+ if (args.length > 3 && Util.isInt(args[2]) && Util.isInt(args[3]))
+ {
+ stack.setAmount(Integer.parseInt(args[2]));
+ stack.setDurability(Short.parseShort(args[3]));
+ }
+ else if (args.length > 2 && Integer.parseInt(args[2]) > 0)
{
stack.setAmount(Integer.parseInt(args[2]));
}
@@ -59,7 +65,7 @@ public class Commandgive extends EssentialsCommand
if (args.length > 3)
{
- for (int i = 3; i < args.length; i++)
+ for (int i = Util.isInt(args[3]) ? 4 : 3; i < args.length; i++)
{
final String[] split = args[i].split("[:+',;.]", 2);
if (split.length < 1)
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
index 4d5bd424b..5ca2aad9a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
@@ -22,31 +22,53 @@ public class Commandgod extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- godOtherPlayers(server, sender, args[0]);
+ godOtherPlayers(server, sender, args);
}
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
- if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.god.others"))
+ if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.god.others"))
{
- godOtherPlayers(server, user, args[0]);
+ godOtherPlayers(server, user, args);
return;
}
-
- user.sendMessage(_("godMode", (user.toggleGodModeEnabled() ? _("enabled") : _("disabled"))));
+ user.setGodModeEnabled(!user.isGodModeEnabled());
+ user.sendMessage(_("godMode", (user.isGodModeEnabled() ? _("enabled") : _("disabled"))));
}
- private void godOtherPlayers(final Server server, final CommandSender sender, final String name)
+ private void godOtherPlayers(final Server server, final CommandSender sender, final String[] args)
{
- for (Player matchPlayer : server.matchPlayer(name))
+ for (Player matchPlayer : server.matchPlayer(args[0]))
{
final User player = ess.getUser(matchPlayer);
if (player.isHidden())
{
continue;
}
- final boolean enabled = player.toggleGodModeEnabled();
+
+ if (args.length > 1)
+ {
+ if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
+ {
+ player.setGodModeEnabled(true);
+ }
+ else
+ {
+ player.setGodModeEnabled(false);
+ }
+ }
+ else
+ {
+ player.setGodModeEnabled(!player.isGodModeEnabled());
+ }
+
+ final boolean enabled = player.isGodModeEnabled();
+ if (enabled)
+ {
+ player.setFoodLevel(20);
+ }
+
player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled"))));
sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName())));
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java b/Essentials/src/com/earth2me/essentials/commands/Commandhat.java
new file mode 100644
index 000000000..5dd0fbb74
--- /dev/null
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhat.java
@@ -0,0 +1,63 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+
+public class Commandhat extends EssentialsCommand
+{
+ public Commandhat()
+ {
+ super("hat");
+ }
+
+ @Override
+ protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length > 0 && (args[0].contains("rem") || args[0].contains("off") || args[0].equalsIgnoreCase("0")))
+ {
+ final PlayerInventory inv = user.getInventory();
+ final ItemStack head = inv.getHelmet();
+ if (head == null || head.getType() == Material.AIR)
+ {
+ user.sendMessage(_("hatEmpty"));
+ }
+ else
+ {
+ final ItemStack air = new ItemStack(Material.AIR);
+ inv.setHelmet(air);
+ InventoryWorkaround.addItem(user.getInventory(), true, head);
+ user.sendMessage(_("hatRemoved"));
+ }
+ }
+ else
+ {
+ if (user.getItemInHand().getType() != Material.AIR)
+ {
+ final ItemStack hand = user.getItemInHand();
+ if (hand.getType().getMaxDurability() == 0)
+ {
+ final PlayerInventory inv = user.getInventory();
+ final ItemStack head = inv.getHelmet();
+ inv.removeItem(hand);
+ inv.setHelmet(hand);
+ inv.setItemInHand(head);
+ user.sendMessage(_("hatPlaced"));
+ }
+ else
+ {
+ user.sendMessage(_("hatArmor"));
+ }
+ }
+ else
+ {
+ user.sendMessage(_("hatFail"));
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index f14422efd..2c91a06c9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -54,7 +54,7 @@ public class Commandhome extends EssentialsCommand
throw new NoChargeException();
}
}
- user.getTeleport().home(player, homeName.toLowerCase(Locale.ENGLISH), charge);
+ goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge);
}
catch (NotEnoughArgumentsException e)
{
@@ -80,7 +80,7 @@ public class Commandhome extends EssentialsCommand
}
else if (homes.size() == 1 && player.equals(user))
{
- user.getTeleport().home(player, homes.get(0), charge);
+ goHome(user, player, homes.get(0), charge);
}
else
{
@@ -93,4 +93,19 @@ public class Commandhome extends EssentialsCommand
}
throw new NoChargeException();
}
+
+ private void goHome(final User user, final User player, final String home, final Trade charge) throws Exception
+ {
+ final Location loc = player.getHome(home);
+ if (loc == null)
+ {
+ throw new NotEnoughArgumentsException();
+ }
+ if (user.getWorld() != loc.getWorld() && ess.getSettings().isWorldHomePermissions()
+ && !user.isAuthorized("essentials.world." + loc.getWorld().getName()))
+ {
+ throw new Exception(_("noPerm", "essentials.world." + loc.getWorld().getName()));
+ }
+ user.getTeleport().home(loc, charge);
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java b/Essentials/src/com/earth2me/essentials/commands/Commandignore.java
index 93dd029a8..8f160e9ba 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandignore.java
@@ -32,15 +32,14 @@ public class Commandignore extends EssentialsCommand
{
throw new Exception(_("playerNotFound"));
}
- final String name = player.getName();
- if (user.isIgnoredPlayer(name))
+ if (user.isIgnoredPlayer(player))
{
- user.setIgnoredPlayer(name, false);
+ user.setIgnoredPlayer(player, false);
user.sendMessage(_("unignorePlayer", player.getName()));
}
else
{
- user.setIgnoredPlayer(name, true);
+ user.setIgnoredPlayer(player, true);
user.sendMessage(_("ignorePlayer", player.getName()));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
index 405b8b799..0e35dda71 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
@@ -36,42 +36,47 @@ public class Commanditem extends EssentialsCommand
{
throw new Exception(_("cantSpawnItem", itemname));
}
-
- if (args.length > 1 && Integer.parseInt(args[1]) > 0)
- {
- stack.setAmount(Integer.parseInt(args[1]));
- }
- else if (ess.getSettings().getDefaultStackSize() > 0)
+ try
{
- stack.setAmount(ess.getSettings().getDefaultStackSize());
- }
- else if (ess.getSettings().getOversizedStackSize() > 0 && user.isAuthorized("essentials.oversizedstacks"))
- {
- stack.setAmount(ess.getSettings().getOversizedStackSize());
- }
-
- if (args.length > 2)
- {
- for (int i = 2; i < args.length; i++)
+ if (args.length > 1 && Integer.parseInt(args[1]) > 0)
{
- final String[] split = args[i].split("[:+',;.]", 2);
- if (split.length < 1)
- {
- continue;
- }
- final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user);
- int level;
- if (split.length > 1)
- {
- level = Integer.parseInt(split[1]);
- }
- else
+ stack.setAmount(Integer.parseInt(args[1]));
+ }
+ else if (ess.getSettings().getDefaultStackSize() > 0)
+ {
+ stack.setAmount(ess.getSettings().getDefaultStackSize());
+ }
+ else if (ess.getSettings().getOversizedStackSize() > 0 && user.isAuthorized("essentials.oversizedstacks"))
+ {
+ stack.setAmount(ess.getSettings().getOversizedStackSize());
+ }
+ if (args.length > 2)
+ {
+ for (int i = 2; i < args.length; i++)
{
- level = enchantment.getMaxLevel();
+ final String[] split = args[i].split("[:+',;.]", 2);
+ if (split.length < 1)
+ {
+ continue;
+ }
+ final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user);
+ int level;
+ if (split.length > 1)
+ {
+ level = Integer.parseInt(split[1]);
+ }
+ else
+ {
+ level = enchantment.getMaxLevel();
+ }
+ stack.addEnchantment(enchantment, level);
}
- stack.addEnchantment(enchantment, level);
}
}
+ catch (NumberFormatException e)
+ {
+ throw new NotEnoughArgumentsException();
+ }
if (stack.getType() == Material.AIR)
{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
index c35656c72..8a408924d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
@@ -1,5 +1,7 @@
package com.earth2me.essentials.commands;
+import static com.earth2me.essentials.I18n._;
+import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -33,5 +35,15 @@ public class Commanditemdb extends EssentialsCommand
itemStack = ess.getItemDb().get(args[0]);
}
sender.sendMessage(itemStack.getType().toString() + "- " + itemStack.getTypeId() + ":" + Integer.toString(itemStack.getData().getData()));
+
+ if (itemStack.getType() != Material.AIR)
+ {
+ int maxuses = itemStack.getType().getMaxDurability();
+ int durability = ((maxuses + 1) - itemStack.getDurability());
+ if (maxuses != 0)
+ {
+ sender.sendMessage(_("durability", Integer.toString(durability)));
+ }
+ }
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
index 39ca305e3..ab73c6e01 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
@@ -37,5 +37,6 @@ public class Commandjump extends EssentialsCommand
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
user.getTeleport().teleport(loc, charge, TeleportCause.COMMAND);
+ throw new NoChargeException();
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
index ae5db48fb..3e2e08b50 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
@@ -24,7 +24,7 @@ public class Commandkick extends EssentialsCommand
}
final User user = getPlayer(server, args, 0);
- if (user.isAuthorized("essentials.kick.exempt"))
+ if (sender instanceof Player && user.isAuthorized("essentials.kick.exempt"))
{
throw new Exception(_("kickExempt"));
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
index 6d97b6af9..4722b7d68 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
@@ -27,5 +27,6 @@ public class Commandkickall extends EssentialsCommand
onlinePlayer.kickPlayer(args.length > 0 ? getFinalArg(args, 0) : _("kickDefault"));
}
}
+ sender.sendMessage(_("kickedAll"));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
index 566cb69d5..77994f156 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
@@ -24,15 +24,14 @@ public class Commandkill extends EssentialsCommand
for (Player matchPlayer : server.matchPlayer(args[0]))
{
- final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, 1000);
+ final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE);
server.getPluginManager().callEvent(ede);
if (ede.isCancelled() && !sender.hasPermission("essentials.kill.force"))
{
continue;
}
- matchPlayer.damage(1000);
- matchPlayer.setHealth(0);
+ matchPlayer.damage(Short.MAX_VALUE);
sender.sendMessage(_("kill", matchPlayer.getDisplayName()));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
index c0b47d20f..d918eeffb 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
@@ -16,6 +16,7 @@ import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Monster;
import org.bukkit.entity.NPC;
+import org.bukkit.entity.Ocelot;
import org.bukkit.entity.Player;
import org.bukkit.entity.Slime;
import org.bukkit.entity.Snowman;
@@ -61,7 +62,7 @@ public class Commandkillall extends EssentialsCommand
}
catch (NumberFormatException e)
{
- throw new Exception(_("numberRequired"));
+ throw new Exception(_("numberRequired"), e);
}
}
}
@@ -121,6 +122,13 @@ public class Commandkillall extends EssentialsCommand
continue;
}
}
+ if(entity instanceof Ocelot)
+ {
+ if (((Ocelot)entity).isTamed())
+ {
+ continue;
+ }
+ }
if (animals)
{
if (entity instanceof Animals || entity instanceof NPC || entity instanceof Snowman || entity instanceof WaterMob)
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index 67f0fafd0..baa8ba014 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -4,6 +4,7 @@ import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import java.util.*;
import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
public class Commandkit extends EssentialsCommand
@@ -19,38 +20,63 @@ public class Commandkit extends EssentialsCommand
if (args.length < 1)
{
final String kitList = Kit.listKits(ess, user);
- if (kitList.length() > 0)
- {
- user.sendMessage(_("kits", kitList));
- }
- else
- {
- user.sendMessage(_("noKits"));
- }
+ user.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
+ throw new NoChargeException();
+ }
+ else if (args.length > 1 && user.isAuthorized("essentials.kit.others"))
+ {
+ final User userTo = getPlayer(server, args, 1, true);
+ final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH));
+ giveKit(userTo, user, kitName);
+ }
+ else
+ {
+ final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH));
+ giveKit(user, user, kitName);
+ }
+ }
+
+ @Override
+ public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length < 2)
+ {
+ final String kitList = Kit.listKits(ess, null);
+ sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
throw new NoChargeException();
}
else
{
+ final User userTo = getPlayer(server, args, 1, true);
final String kitName = args[0].toLowerCase(Locale.ENGLISH);
+
final Map<String, Object> kit = ess.getSettings().getKit(kitName);
+ final List<String> items = Kit.getItems(userTo, kit);
+ Kit.expandItems(ess, userTo, items);
+
+ sender.sendMessage(_("kitGive", kitName));
+ }
+ }
- if (!user.isAuthorized("essentials.kit." + kitName))
- {
- throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
- }
+ private void giveKit(User userTo, User userFrom, String kitName) throws Exception
+ {
+ final Map<String, Object> kit = ess.getSettings().getKit(kitName);
- final List<String> items = Kit.getItems(user, kit);
+ if (!userFrom.isAuthorized("essentials.kit." + kitName))
+ {
+ throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
+ }
- Kit.checkTime(user, kitName, kit);
+ final List<String> items = Kit.getItems(userTo, kit);
- final Trade charge = new Trade("kit-" + kitName, ess);
- charge.isAffordableFor(user);
+ Kit.checkTime(userFrom, kitName, kit);
- Kit.expandItems(ess, user, items);
+ final Trade charge = new Trade("kit-" + kitName, ess);
+ charge.isAffordableFor(userFrom);
- charge.charge(user);
- user.sendMessage(_("kitGive", kitName));
+ Kit.expandItems(ess, userTo, items);
- }
+ charge.charge(userFrom);
+ userTo.sendMessage(_("kitGive", kitName));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
index 810ef0b33..5d72d0b55 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
@@ -23,11 +23,11 @@ public class Commandlightning extends EssentialsCommand
if (sender instanceof Player)
{
user = ess.getUser(((Player)sender));
- }
- if ((args.length < 1 || !user.isAuthorized("essentials.lightning.others")) & user != null)
- {
- user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
- return;
+ if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others")))
+ {
+ user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
+ return;
+ }
}
if (server.matchPlayer(args[0]).isEmpty())
@@ -35,7 +35,7 @@ public class Commandlightning extends EssentialsCommand
throw new Exception(_("playerNotFound"));
}
- int power = 1;
+ int power = 5;
if (args.length > 1)
{
try
@@ -50,18 +50,12 @@ public class Commandlightning extends EssentialsCommand
for (Player matchPlayer : server.matchPlayer(args[0]))
{
sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
- if (power <= 0)
- {
- matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
- }
- else
- {
- LightningStrike strike = matchPlayer.getWorld().strikeLightning(matchPlayer.getLocation());
- matchPlayer.damage(power - 1, strike);
- }
+
+ final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
+
if (!ess.getUser(matchPlayer).isGodModeEnabled())
{
- matchPlayer.setHealth(matchPlayer.getHealth() < 5 ? 0 : matchPlayer.getHealth() - 5);
+ matchPlayer.damage(power, strike);
}
if (ess.getSettings().warnOnSmite())
{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
index fa4643875..60306c272 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -4,7 +4,6 @@ import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.List;
-import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -57,7 +56,7 @@ public class Commandmail extends EssentialsCommand
{
throw new Exception(_("playerNeverOnServer", args[1]));
}
- if (!u.isIgnoredPlayer(user.getName()))
+ if (!u.isIgnoredPlayer(user))
{
final String mail = Util.sanitizeString(Util.stripFormat(getFinalArg(args, 2)));
u.addMail(user.getName() + ": " + mail);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
index 2e1011e3b..fe39a1c04 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
@@ -21,11 +21,11 @@ public class Commandmsg extends EssentialsCommand
@Override
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
{
- if (args.length < 2 || args[0].trim().isEmpty() || args[1].trim().isEmpty())
+ if (args.length < 2 || args[0].trim().length() < 3 || args[1].trim().isEmpty())
{
throw new NotEnoughArgumentsException();
}
-
+
String message = getFinalArg(args, 1);
if (sender instanceof Player)
{
@@ -81,7 +81,7 @@ public class Commandmsg extends EssentialsCommand
{
sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
final User matchedUser = ess.getUser(matchedPlayer);
- if (sender instanceof Player && (matchedUser.isIgnoredPlayer(((Player)sender).getName()) || matchedUser.isHidden()))
+ if (sender instanceof Player && (matchedUser.isIgnoredPlayer(ess.getUser(sender)) || matchedUser.isHidden()))
{
continue;
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
index 3e70cc507..fa86a8a02 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
@@ -28,13 +28,19 @@ public class Commandmute extends EssentialsCommand
throw new Exception(_("muteExempt"));
}
long muteTimestamp = 0;
+
if (args.length > 1)
{
- String time = getFinalArg(args, 1);
+ final String time = getFinalArg(args, 1);
muteTimestamp = Util.parseDateDiff(time, true);
+ player.setMuted(true);
+ }
+ else
+ {
+ player.setMuted(!player.getMuted());
}
player.setMuteTimeout(muteTimestamp);
- final boolean muted = player.toggleMuted();
+ final boolean muted = player.getMuted();
sender.sendMessage(
muted
? (muteTimestamp > 0
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
index 01e1fcffb..fde9be58a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
@@ -22,14 +22,14 @@ public class Commandpay extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- if (args[0] == "")
+ if (args[0].trim().length() < 3)
{
throw new NotEnoughArgumentsException("You need to specify a player to pay.");
}
double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));
- Boolean foundUser = false;
+ boolean foundUser = false;
for (Player p : server.matchPlayer(args[0]))
{
User u = ess.getUser(p);
@@ -42,9 +42,9 @@ public class Commandpay extends EssentialsCommand
foundUser = true;
}
- if (foundUser == false)
+ if (!foundUser)
{
- throw new NoSuchFieldException(_("playerNotFound"));
+ throw new NotEnoughArgumentsException(_("playerNotFound"));
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
index ca03364b2..d1d0fb582 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
@@ -51,26 +51,18 @@ public class Commandpowertool extends EssentialsCommand
{
user.sendMessage(_("powerToolList", Util.joinList(powertools), itemName));
}
- return;
+ throw new NoChargeException();
}
if (command.startsWith("r:"))
{
- try
+ command = command.substring(2);
+ if (!powertools.contains(command))
{
- command = command.substring(2);
- if (!powertools.contains(command))
- {
- throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName));
- }
-
- powertools.remove(command);
- user.sendMessage(_("powerToolRemove", command, itemName));
- }
- catch (Exception e)
- {
- user.sendMessage(e.getMessage());
- return;
+ throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName));
}
+
+ powertools.remove(command);
+ user.sendMessage(_("powerToolRemove", command, itemName));
}
else
{
@@ -85,7 +77,6 @@ public class Commandpowertool extends EssentialsCommand
{
throw new Exception(_("powerToolAlreadySet", command, itemName));
}
-
}
else if (powertools != null && !powertools.isEmpty())
{
@@ -110,6 +101,11 @@ public class Commandpowertool extends EssentialsCommand
user.sendMessage(_("powerToolRemoveAll", itemName));
}
+ if (!user.arePowerToolsEnabled())
+ {
+ user.setPowerToolsEnabled(true);
+ user.sendMessage(_("powerToolsEnabled"));
+ }
user.setPowertool(itemStack, powertools);
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
index b16cbdc34..866846733 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
@@ -55,7 +55,7 @@ public class Commandptime extends EssentialsCommand
Long ticks;
// Parse the target time int ticks from args[0]
String timeParam = args[0];
- Boolean relative = true;
+ boolean relative = true;
if (timeParam.startsWith("@"))
{
relative = false;
@@ -79,7 +79,7 @@ public class Commandptime extends EssentialsCommand
}
catch (NumberFormatException e)
{
- throw new NotEnoughArgumentsException();
+ throw new NotEnoughArgumentsException(e);
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
index 9b585509d..d2dfeb78b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
@@ -55,7 +55,7 @@ public class Commandr extends EssentialsCommand
if (target instanceof Player)
{
User player = ess.getUser(target);
- if (player.isIgnoredPlayer(sender instanceof Player ? ((Player)sender).getName() : Console.NAME))
+ if (sender instanceof Player && player.isIgnoredPlayer(ess.getUser(sender)))
{
return;
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java
index d245d1239..0957a7989 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java
@@ -9,7 +9,7 @@ import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.*;
-
+//Todo: Fix this up
public class Commandremove extends EssentialsCommand
{
public Commandremove()
@@ -47,7 +47,7 @@ public class Commandremove extends EssentialsCommand
}
catch (NumberFormatException e)
{
- throw new Exception(_("numberRequired"));
+ throw new Exception(_("numberRequired"), e);
}
}
@@ -57,7 +57,7 @@ public class Commandremove extends EssentialsCommand
}
catch (IllegalArgumentException e)
{
- throw new NotEnoughArgumentsException(); //TODO: translate and list types
+ throw new NotEnoughArgumentsException(e); //TODO: translate and list types
}
removeEntities(user, world, toRemove, radius);
@@ -84,7 +84,7 @@ public class Commandremove extends EssentialsCommand
}
catch (IllegalArgumentException e)
{
- throw new NotEnoughArgumentsException(); //TODO: translate and list types
+ throw new NotEnoughArgumentsException(e); //TODO: translate and list types
}
removeEntities(sender, world, toRemove, 0);
}
@@ -92,8 +92,9 @@ public class Commandremove extends EssentialsCommand
protected void removeEntities(final CommandSender sender, final World world, final ToRemove toRemove, int radius) throws Exception
{
int removed = 0;
- if (radius > 0) {
- radius*=radius;
+ if (radius > 0)
+ {
+ radius *= radius;
}
for (Chunk chunk : world.getLoadedChunks())
{
@@ -130,7 +131,7 @@ public class Commandremove extends EssentialsCommand
removed++;
}
}
- else if (toRemove == ToRemove.DROPS)
+ else if (toRemove == ToRemove.MINECARTS)
{
if (e instanceof Minecart)
{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index 8d1278fd0..d621109f7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -53,6 +53,8 @@ public class Commandrepair extends EssentialsCommand
}
else if (args[0].equalsIgnoreCase("all"))
{
+ final Trade charge = new Trade("repair-all", ess);
+ charge.isAffordableFor(user);
final List<String> repaired = new ArrayList<String>();
repairItems(user.getInventory().getContents(), user, repaired);
@@ -69,6 +71,7 @@ public class Commandrepair extends EssentialsCommand
{
user.sendMessage(_("repair", Util.joinList(repaired)));
}
+ charge.charge(user);
}
else
@@ -102,7 +105,7 @@ public class Commandrepair extends EssentialsCommand
continue;
}
final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH);
- final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), ess);
+ final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), "repair-item", ess);
try
{
charge.isAffordableFor(user);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
index 38abb2dab..24f1f9c41 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
+import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
@@ -17,16 +18,16 @@ public class Commandseen extends EssentialsCommand
@Override
protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
- seen(server, sender, args, true);
+ seen(server, sender, args, true, true);
}
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
- seen(server, user, args, user.isAuthorized("essentials.seen.banreason"));
+ seen(server, user, args, user.isAuthorized("essentials.seen.banreason"), user.isAuthorized("essentials.seen.extra"));
}
- protected void seen(final Server server, final CommandSender sender, final String[] args, final boolean show) throws Exception
+ protected void seen(final Server server, final CommandSender sender, final String[] args, final boolean showBan, final boolean extra) throws Exception
{
if (args.length < 1)
{
@@ -37,6 +38,10 @@ public class Commandseen extends EssentialsCommand
User player = getPlayer(server, args, 0);
player.setDisplayNick();
sender.sendMessage(_("seenOnline", player.getDisplayName(), Util.formatDateDiff(player.getLastLogin())));
+ if (extra)
+ {
+ sender.sendMessage(_("whoisIPAddress", player.getAddress().getAddress().toString()));
+ }
}
catch (NoSuchFieldException e)
{
@@ -46,10 +51,18 @@ public class Commandseen extends EssentialsCommand
throw new Exception(_("playerNotFound"));
}
player.setDisplayNick();
- sender.sendMessage(_("seenOffline", player.getDisplayName(), Util.formatDateDiff(player.getLastLogout())));
+ sender.sendMessage(_("seenOffline", player.getName(), Util.formatDateDiff(player.getLastLogout())));
if (player.isBanned())
{
- sender.sendMessage(_("whoisBanned", show ? player.getBanReason() : _("true")));
+ sender.sendMessage(_("whoisBanned", showBan ? player.getBanReason() : _("true")));
+ }
+ if (extra)
+ {
+ sender.sendMessage(_("whoisIPAddress", player.getLastLoginAddress()));
+ final Location loc = player.getLastLocation();
+ if (loc != null) {
+ sender.sendMessage(_("whoisLocation", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+ }
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
index ec19ca678..f622094d2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
@@ -29,7 +29,8 @@ public class Commandsethome extends EssentialsCommand
{
if (user.isAuthorized("essentials.sethome.multiple"))
{
- if ("bed".equals(args[0].toLowerCase(Locale.ENGLISH))) {
+ if ("bed".equals(args[0].toLowerCase(Locale.ENGLISH)))
+ {
throw new NotEnoughArgumentsException();
}
if ((user.isAuthorized("essentials.sethome.multiple.unlimited")) || (user.getHomes().size() < ess.getSettings().getHomeLimit(user))
@@ -66,7 +67,8 @@ public class Commandsethome extends EssentialsCommand
{
name = "home";
}
- if ("bed".equals(name.toLowerCase(Locale.ENGLISH))) {
+ if ("bed".equals(name.toLowerCase(Locale.ENGLISH)))
+ {
throw new NotEnoughArgumentsException();
}
usersHome.setHome(name, user.getLocation());
@@ -77,7 +79,7 @@ public class Commandsethome extends EssentialsCommand
{
user.setHome();
}
- user.sendMessage(_("homeSet"));
+ user.sendMessage(_("homeSet", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java
index 8ed298303..877da4d26 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.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.Util;
import org.bukkit.Server;
@@ -20,7 +21,7 @@ public class Commandsetjail extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
ess.getJails().setJail(args[0], user.getLocation());
- user.sendMessage(_("jailSet", args[0]));
+ user.sendMessage(_("jailSet", Util.sanitizeString(args[0])));
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
index fdaa0eb9e..2546a76dd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
@@ -103,7 +103,7 @@ public class Commandspawnmob extends EssentialsCommand
}
catch (MobException e)
{
- throw new Exception(_("unableToSpawnMob"));
+ throw new Exception(_("unableToSpawnMob"), e);
}
if (mountType != null)
@@ -129,7 +129,7 @@ public class Commandspawnmob extends EssentialsCommand
}
catch (MobException e)
{
- throw new Exception(_("unableToSpawnMob"));
+ throw new Exception(_("unableToSpawnMob"), e);
}
spawnedMob.setPassenger(spawnedMount);
}
@@ -164,7 +164,7 @@ public class Commandspawnmob extends EssentialsCommand
}
catch (MobException e)
{
- throw new Exception(_("unableToSpawnMob"));
+ throw new Exception(_("unableToSpawnMob"), e);
}
spawnedMob.setPassenger(spawnedMount);
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
index 50933c8f5..84c9fc489 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
@@ -16,10 +16,9 @@ public class Commandsuicide extends EssentialsCommand
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
- EntityDamageEvent ede = new EntityDamageEvent(user.getBase(), EntityDamageEvent.DamageCause.SUICIDE, 1000);
+ EntityDamageEvent ede = new EntityDamageEvent(user.getBase(), EntityDamageEvent.DamageCause.SUICIDE, Short.MAX_VALUE);
server.getPluginManager().callEvent(ede);
- user.damage(1000);
- user.setHealth(0);
+ user.damage(Short.MAX_VALUE);
user.sendMessage(_("suicideMessage"));
user.setDisplayNick();
ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName()));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
index 25c457a20..0549e9c0d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
@@ -44,12 +44,12 @@ public class Commandtempban extends EssentialsCommand
final String time = getFinalArg(args, 1);
final long banTimestamp = Util.parseDateDiff(time, true);
- final String banReason = _("tempBanned", Util.formatDateDiff(banTimestamp));
+ final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+ final String banReason = _("tempBanned", Util.formatDateDiff(banTimestamp), senderName);
user.setBanReason(banReason);
user.setBanTimeout(banTimestamp);
user.setBanned(true);
user.kickPlayer(banReason);
- final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
for (Player onlinePlayer : server.getOnlinePlayers())
{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
index c49f34fbd..8e5b7c017 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.DescParseTickFormat;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
import java.util.*;
import org.bukkit.Server;
import org.bukkit.World;
@@ -19,16 +20,23 @@ public class Commandtime extends EssentialsCommand
@Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
+ final List<String> argList = new ArrayList<String>(Arrays.asList(args));
+ if ((argList.remove("set") || argList.remove("add")) && Util.isInt(argList.get(0)))
+ {
+ ess.getLogger().info("debug edited 0" + argList.get(0).toString());
+ }
+ final String[] validArgs = argList.toArray(new String[0]);
+
// Which World(s) are we interested in?
String worldSelector = null;
- if (args.length == 2)
+ if (validArgs.length == 2)
{
- worldSelector = args[1];
+ worldSelector = validArgs[1];
}
final Set<World> worlds = getWorlds(server, sender, worldSelector);
// If no arguments we are reading the time
- if (args.length == 0)
+ if (validArgs.length == 0)
{
getWorldsTime(sender, worlds);
return;
@@ -45,11 +53,11 @@ public class Commandtime extends EssentialsCommand
long ticks;
try
{
- ticks = DescParseTickFormat.parse(args[0]);
+ ticks = DescParseTickFormat.parse(validArgs[0]);
}
catch (NumberFormatException e)
{
- throw new NotEnoughArgumentsException();
+ throw new NotEnoughArgumentsException(e);
}
setWorldsTime(sender, worlds, ticks);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
index 95cbc58cd..d94f0aca5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
@@ -30,7 +30,7 @@ public class Commandtpa extends EssentialsCommand
{
throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
}
- if (!player.isIgnoredPlayer(user.getName()))
+ if (!player.isIgnoredPlayer(user))
{
player.requestTeleport(user, false);
player.sendMessage(_("teleportRequest", user.getDisplayName()));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
index 53204114e..4d7ced478 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
@@ -34,6 +34,7 @@ public class Commandtpo extends EssentialsCommand
}
user.sendMessage(_("teleporting"));
user.getTeleport().now(player, false, TeleportCause.COMMAND);
+ break;
default:
if (!user.isAuthorized("essentials.tp.others"))
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
index 226fa44e3..75910cd85 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
@@ -5,6 +5,7 @@ import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import org.bukkit.Location;
import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -41,4 +42,30 @@ public class Commandtppos extends EssentialsCommand
user.getTeleport().teleport(location, charge, TeleportCause.COMMAND);
throw new NoChargeException();
}
+
+ @Override
+ public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length < 4)
+ {
+ throw new NotEnoughArgumentsException();
+ }
+
+ User user = ess.getUser(server.getPlayer(args[0]));
+ final int x = Integer.parseInt(args[1]);
+ final int y = Integer.parseInt(args[2]);
+ final int z = Integer.parseInt(args[3]);
+ final Location location = new Location(user.getWorld(), x, y, z);
+ if (args.length > 4)
+ {
+ location.setYaw((Float.parseFloat(args[4]) + 180 + 360) % 360);
+ }
+ if (args.length > 5)
+ {
+ location.setPitch(Float.parseFloat(args[5]));
+ }
+ sender.sendMessage(_("teleporting"));
+ user.sendMessage(_("teleporting"));
+ user.getTeleport().teleport(location, null, TeleportCause.COMMAND);
+ }
} \ No newline at end of file
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
index 8bc3ad068..dda1475d0 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
@@ -29,7 +29,7 @@ public class Commandunban extends EssentialsCommand
}
catch (NoSuchFieldException e)
{
- throw new Exception(_("playerNotFound"));
+ throw new Exception(_("playerNotFound"), e);
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
index beff6a77b..585fec3b3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
@@ -98,7 +98,7 @@ public class Commandunlimited extends EssentialsCommand
}
String message = "disableUnlimited";
- Boolean enableUnlimited = false;
+ boolean enableUnlimited = false;
if (!target.hasUnlimited(stack))
{
message = "enableUnlimited";
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java b/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java
new file mode 100644
index 000000000..ea051e4be
--- /dev/null
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java
@@ -0,0 +1,43 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandvanish extends EssentialsCommand
+{
+ public Commandvanish()
+ {
+ super("vanish");
+ }
+
+ @Override
+ protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length < 1)
+ {
+ user.toggleVanished();
+ if (user.isVanished())
+ {
+ user.sendMessage(_("vanished"));
+ }
+ else
+ {
+ user.sendMessage(_("unvanished"));
+ }
+ }
+ else
+ {
+ if (args[0].contains("on") || args[0].contains("ena") || args[0].equalsIgnoreCase("1"))
+ {
+ user.setVanished(true);
+ }
+ else
+ {
+ user.setVanished(false);
+ }
+ user.sendMessage(user.isVanished() ? _("vanished") : _("unvanished"));
+ }
+ }
+}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
index 6c7919163..4a6903ae4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
@@ -38,6 +38,7 @@ public class Commandwhois extends EssentialsCommand
}
final String whois = args[0].toLowerCase(Locale.ENGLISH);
final int prefixLength = Util.stripFormat(ess.getSettings().getNicknamePrefix()).length();
+ boolean foundUser = false;
for (Player onlinePlayer : server.getOnlinePlayers())
{
final User user = ess.getUser(onlinePlayer);
@@ -52,27 +53,17 @@ public class Commandwhois extends EssentialsCommand
{
continue;
}
- sender.sendMessage("");
+ foundUser = true;
+ sender.sendMessage(_("whoisTop", user.getName()));
user.setDisplayNick();
- sender.sendMessage(_("whoisIs", user.getDisplayName(), user.getName()));
+ sender.sendMessage(_("whoisNick", user.getDisplayName()));
sender.sendMessage(_("whoisHealth", user.getHealth()));
- sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(user), user.getLevel()));
- sender.sendMessage(_("whoisOP", (user.isOp() ? _("true") : _("false"))));
- sender.sendMessage(_("whoisGod", (user.isGodModeEnabled() ? _("true") : _("false"))));
- sender.sendMessage(_("whoisGamemode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH))));
+ sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(user), user.getLevel()));
sender.sendMessage(_("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
if (!ess.getSettings().isEcoDisabled())
{
sender.sendMessage(_("whoisMoney", Util.displayCurrency(user.getMoney(), ess)));
}
- sender.sendMessage(_("whoisJail", (user.isJailed()
- ? user.getJailTimeout() > 0
- ? Util.formatDateDiff(user.getJailTimeout())
- : _("true")
- : _("false"))));
- sender.sendMessage(user.isAfk()
- ? _("whoisStatusAway")
- : _("whoisStatusAvailable"));
sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString()));
final String location = user.getGeoLocation();
if (location != null
@@ -80,6 +71,26 @@ public class Commandwhois extends EssentialsCommand
{
sender.sendMessage(_("whoisGeoLocation", location));
}
+ sender.sendMessage(_("whoisGamemode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH))));
+ sender.sendMessage(_("whoisGod", (user.isGodModeEnabled() ? _("true") : _("false"))));
+ sender.sendMessage(_("whoisOp", (user.isOp() ? _("true") : _("false"))));
+ sender.sendMessage(_("whoisFly", user.getAllowFlight() ? _("true") : _("false"), user.isFlying() ? _("flying") : _("notFlying")));
+ sender.sendMessage(_("whoisAFK", (user.isAfk() ? _("true") : _("false"))));
+ sender.sendMessage(_("whoisJail", (user.isJailed()
+ ? user.getJailTimeout() > 0
+ ? Util.formatDateDiff(user.getJailTimeout())
+ : _("true")
+ : _("false"))));
+ sender.sendMessage(_("whoisMuted", (user.isMuted()
+ ? user.getMuteTimeout() > 0
+ ? Util.formatDateDiff(user.getMuteTimeout())
+ : _("true")
+ : _("false"))));
+
+ }
+ if (!foundUser)
+ {
+ throw new NoSuchFieldException(_("playerNotFound"));
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
index fee9d41e3..ce617fcd5 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
@@ -633,4 +633,40 @@ public class FakeWorld implements World
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public int getMonsterSpawnLimit()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setMonsterSpawnLimit(int arg0)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int getAnimalSpawnLimit()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setAnimalSpawnLimit(int arg0)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int getWaterAnimalSpawnLimit()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setWaterAnimalSpawnLimit(int arg0)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java b/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java
deleted file mode 100644
index 3ddfd20b5..000000000
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.earth2me.essentials.craftbukkit;
-
-import com.earth2me.essentials.IEssentials;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.minecraft.server.NBTTagCompound;
-import net.minecraft.server.WorldNBTStorage;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.CraftWorld;
-
-
-public class OfflineBedLocation
-{
- public static Location getBedLocation(final String playername, final IEssentials ess)
- {
- try
- {
- final CraftServer cserver = (CraftServer)ess.getServer();
- if (cserver == null)
- {
- return null;
- }
- final WorldNBTStorage wnbtStorage = (WorldNBTStorage)cserver.getHandle().playerFileData;
- if (wnbtStorage == null)
- {
- return null;
- }
- final NBTTagCompound playerStorage = wnbtStorage.getPlayerData(playername);
- if (playerStorage == null)
- {
- return null;
- }
-
- if (playerStorage.hasKey("SpawnX") && playerStorage.hasKey("SpawnY") && playerStorage.hasKey("SpawnZ"))
- {
- String spawnWorld = playerStorage.getString("SpawnWorld");
- if ("".equals(spawnWorld))
- {
- spawnWorld = cserver.getWorlds().get(0).getName();
- }
- return new Location(cserver.getWorld(spawnWorld), playerStorage.getInt("SpawnX"), playerStorage.getInt("SpawnY"), playerStorage.getInt("SpawnZ"));
- }
- return null;
- }
- catch (Throwable ex)
- {
- Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
- return null;
- }
- }
-}
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java b/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java
index 70d15b856..b788fa7ee 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java
@@ -53,7 +53,7 @@ public class SetExpFix
//Without this people would be able to use exp and then still sell it.
public static int getTotalExperience(final Player player)
{
- int exp = (int) (getExpToLevel(player) * player.getExp());
+ int exp = (int)Math.round(getExpToLevel(player) * player.getExp());
int currentLevel = player.getLevel();
while (currentLevel > 0) {
diff --git a/Essentials/src/com/earth2me/essentials/metrics/Metrics.java b/Essentials/src/com/earth2me/essentials/metrics/Metrics.java
index e009daa5d..f361e4f50 100644
--- a/Essentials/src/com/earth2me/essentials/metrics/Metrics.java
+++ b/Essentials/src/com/earth2me/essentials/metrics/Metrics.java
@@ -223,7 +223,7 @@ public class Metrics
}
catch (IOException e)
{
- Bukkit.getLogger().log(Level.INFO, "[Metrics] {0}", e.getMessage());
+ Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
}
}
}, 0, PING_INTERVAL * 1200);
@@ -246,12 +246,12 @@ public class Metrics
}
catch (IOException ex)
{
- Bukkit.getLogger().log(Level.INFO, "[Metrics] {0}", ex.getMessage());
+ Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
return true;
}
catch (InvalidConfigurationException ex)
{
- Bukkit.getLogger().log(Level.INFO, "[Metrics] {0}", ex.getMessage());
+ Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
return true;
}
return configuration.getBoolean("opt-out", false);
diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
index 6380b7f6c..0ea692cc9 100644
--- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
+++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
@@ -4,6 +4,7 @@ import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.metrics.Metrics.Graph;
import com.earth2me.essentials.metrics.Metrics.Plotter;
import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.register.payment.methods.VaultEco;
import java.util.Locale;
import java.util.logging.Level;
@@ -150,11 +151,19 @@ public class MetricsStarter implements Runnable
final Method method = ess.getPaymentMethod().getMethod();
if (method != null)
{
- String version = method.getVersion();
- final int dashPosition = version.indexOf('-');
- if (dashPosition > 0)
+ String version;
+ if (method instanceof VaultEco)
{
- version = version.substring(0, dashPosition);
+ version = ((VaultEco)method).getEconomy();
+ }
+ else
+ {
+ version = method.getVersion();
+ final int dashPosition = version.indexOf('-');
+ if (dashPosition > 0)
+ {
+ version = version.substring(0, dashPosition);
+ }
}
depGraph.addPlotter(new SimplePlotter(method.getName() + " " + version));
}
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java
index b3cc62979..aef6401d9 100644
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java
@@ -78,6 +78,6 @@ public class PermissionsBukkitHandler extends SuperpermsHandler
@Override
public boolean canBuild(Player base, String group)
{
- return base.hasPermission("essentials.build") || base.hasPermission("permissions.build");
+ return hasPermission(base, "essentials.build") || hasPermission(base, "permissions.build");
}
}
diff --git a/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java b/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java
index c81f93cbc..6cc97f30e 100644
--- a/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java
@@ -55,7 +55,7 @@ public class PrivilegesHandler extends SuperpermsHandler
@Override
public boolean canBuild(Player base, String group)
{
- return base.hasPermission("essentials.build") || base.hasPermission("privileges.build");
+ return hasPermission(base, "essentials.build") || hasPermission(base, "privileges.build");
}
}
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Method.java b/Essentials/src/com/earth2me/essentials/register/payment/Method.java
index a942667e8..c4c9d401a 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/Method.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/Method.java
@@ -33,6 +33,13 @@ public interface Method
* @return <code>String</code> Plugin name.
*/
public String getName();
+
+ /**
+ * Returns the reported name of this method.
+ *
+ * @return <code>String</code> Plugin name.
+ */
+ public String getLongName();
/**
* Returns the actual version of this method.
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java
index c3b71d4e3..a77a1d3b0 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java
@@ -8,9 +8,8 @@ import org.bukkit.plugin.Plugin;
/**
* BOSEconomy 6 Implementation of Method
*
- * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun)
- * @copyright (c) 2011
- * @license AOL license <http://aol.nexua.org>
+ * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license
+ * <http://aol.nexua.org>
*/
@SuppressWarnings("deprecation")
public class BOSE6 implements Method
@@ -30,6 +29,12 @@ public class BOSE6 implements Method
}
@Override
+ public String getLongName()
+ {
+ return getName();
+ }
+
+ @Override
public String getVersion()
{
return "0.6.2";
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java
index d21ea6244..7aab8c459 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java
@@ -9,9 +9,8 @@ import org.bukkit.plugin.Plugin;
* BOSEconomy 7 Implementation of Method
*
* @author Acrobot
- * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun)
- * @copyright (c) 2011
- * @license AOL license <http://aol.nexua.org>
+ * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license
+ * <http://aol.nexua.org>
*/
public class BOSE7 implements Method
{
@@ -30,6 +29,12 @@ public class BOSE7 implements Method
}
@Override
+ public String getLongName()
+ {
+ return getName();
+ }
+
+ @Override
public String getVersion()
{
return "0.7.0";
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java
index 87d633b5c..92c4f4f19 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java
@@ -9,9 +9,7 @@ import org.bukkit.plugin.Plugin;
/**
* MultiCurrency Method implementation.
*
- * @author Acrobot
- * @copyright (c) 2011
- * @license AOL license <http://aol.nexua.org>
+ * @author Acrobot @copyright (c) 2011 @license AOL license <http://aol.nexua.org>
*/
public class MCUR implements Method
{
@@ -30,6 +28,12 @@ public class MCUR implements Method
}
@Override
+ public String getLongName()
+ {
+ return getName();
+ }
+
+ @Override
public String getVersion()
{
return "0.09";
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
index 84ce816cf..f0a8171f3 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
@@ -34,8 +34,18 @@ public class VaultEco implements Method
@Override
public String getName()
{
-
- return this.vault.getDescription().getName().concat(" - Economy: ").concat(economy == null ? "NoEco" : economy.getName());
+ return this.vault.getDescription().getName();
+ }
+
+ public String getEconomy()
+ {
+ return economy == null ? "NoEco" : economy.getName();
+ }
+
+ @Override
+ public String getLongName()
+ {
+ return getName().concat(" - Economy: ").concat(getEconomy());
}
@Override
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java
index 52fb36e15..4542f6743 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java
@@ -9,9 +9,8 @@ import org.bukkit.plugin.Plugin;
/**
* iConomy 4 Implementation of Method
*
- * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun)
- * @copyright (c) 2011
- * @license AOL license <http://aol.nexua.org>
+ * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license
+ * <http://aol.nexua.org>
*/
public class iCo4 implements Method
{
@@ -30,6 +29,12 @@ public class iCo4 implements Method
}
@Override
+ public String getLongName()
+ {
+ return getName();
+ }
+
+ @Override
public String getVersion()
{
return "4";
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java
index 3b2fb2f6d..87144fa34 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java
@@ -12,9 +12,8 @@ import org.bukkit.plugin.Plugin;
/**
* iConomy 5 Implementation of Method
*
- * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun)
- * @copyright (c) 2011
- * @license AOL license <http://aol.nexua.org>
+ * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license
+ * <http://aol.nexua.org>
*/
public class iCo5 implements Method
{
@@ -33,6 +32,12 @@ public class iCo5 implements Method
}
@Override
+ public String getLongName()
+ {
+ return getName();
+ }
+
+ @Override
public String getVersion()
{
return "5";
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java
index 1a2950847..ecd1d6aae 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java
@@ -11,9 +11,8 @@ import org.bukkit.plugin.Plugin;
/**
* iConomy 6 Implementation of Method
*
- * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun)
- * @copyright (c) 2011
- * @license AOL license <http://aol.nexua.org>
+ * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license
+ * <http://aol.nexua.org>
*/
public class iCo6 implements Method
{
@@ -32,6 +31,12 @@ public class iCo6 implements Method
}
@Override
+ public String getLongName()
+ {
+ return getName();
+ }
+
+ @Override
public String getVersion()
{
return "6";
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index 21e70516e..389effc64 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -76,6 +76,10 @@ public class EssentialsSign
{
final ISign sign = new BlockSign(block);
final User user = ess.getUser(player);
+ if (user.checkSignThrottle())
+ {
+ return false;
+ }
try
{
return (user.isAuthorized("essentials.signs." + signName.toLowerCase(Locale.ENGLISH) + ".use")
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
index 8acca9804..c159510c7 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -19,16 +19,18 @@ public class SignBlockListener implements Listener
{
private final transient IEssentials ess;
private final static Logger LOGGER = Logger.getLogger("Minecraft");
+ private final static int WALL_SIGN = Material.WALL_SIGN.getId();
+ private final static int SIGN_POST = Material.SIGN_POST.getId();
public SignBlockListener(IEssentials ess)
{
this.ess = ess;
}
- @EventHandler(priority = EventPriority.HIGHEST)
+ @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockBreak(final BlockBreakEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled())
{
return;
}
@@ -42,7 +44,7 @@ public class SignBlockListener implements Listener
public boolean protectSignsAndBlocks(final Block block, final Player player)
{
final int mat = block.getTypeId();
- if (mat == Material.SIGN_POST.getId() || mat == Material.WALL_SIGN.getId())
+ if (mat == SIGN_POST || mat == WALL_SIGN)
{
final Sign csign = (Sign)block.getState();
@@ -55,31 +57,28 @@ public class SignBlockListener implements Listener
}
}
}
- else
+ // prevent any signs be broken by destroying the block they are attached to
+ if (EssentialsSign.checkIfBlockBreaksSigns(block))
{
- // prevent any signs be broken by destroying the block they are attached to
- if (EssentialsSign.checkIfBlockBreaksSigns(block))
+ LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign.");
+ return true;
+ }
+ for (EssentialsSign sign : ess.getSettings().enabledSigns())
+ {
+ if (sign.getBlocks().contains(block.getType())
+ && !sign.onBlockBreak(block, player, ess))
{
- LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign.");
+ LOGGER.log(Level.INFO, "A block was protected by a sign.");
return true;
}
- for (EssentialsSign sign : ess.getSettings().enabledSigns())
- {
- if (sign.getBlocks().contains(block.getType())
- && !sign.onBlockBreak(block, player, ess))
- {
- LOGGER.log(Level.INFO, "A block was protected by a sign.");
- return true;
- }
- }
}
return false;
}
- @EventHandler(priority = EventPriority.HIGHEST)
+ @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onSignChange(final SignChangeEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled())
{
return;
}
@@ -107,25 +106,25 @@ public class SignBlockListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOW)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockPlace(final BlockPlaceEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled())
{
return;
}
final Block against = event.getBlockAgainst();
- if ((against.getType() == Material.WALL_SIGN
- || against.getType() == Material.SIGN_POST)
+ if ((against.getTypeId() == WALL_SIGN
+ || against.getTypeId() == SIGN_POST)
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against)))
{
event.setCancelled(true);
return;
}
final Block block = event.getBlock();
- if (block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (block.getTypeId() == WALL_SIGN
+ || block.getTypeId() == SIGN_POST)
{
return;
}
@@ -141,17 +140,17 @@ public class SignBlockListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOW)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockBurn(final BlockBurnEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled())
{
return;
}
final Block block = event.getBlock();
- if (((block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (((block.getTypeId() == WALL_SIGN
+ || block.getTypeId() == SIGN_POST)
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
|| EssentialsSign.checkIfBlockBreaksSigns(block))
{
@@ -169,17 +168,17 @@ public class SignBlockListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOW)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockIgnite(final BlockIgniteEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled())
{
return;
}
final Block block = event.getBlock();
- if (((block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (((block.getTypeId() == WALL_SIGN
+ || block.getTypeId() == SIGN_POST)
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
|| EssentialsSign.checkIfBlockBreaksSigns(block))
{
@@ -200,10 +199,15 @@ public class SignBlockListener implements Listener
@EventHandler(priority = EventPriority.LOW)
public void onBlockPistonExtend(final BlockPistonExtendEvent event)
{
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
+
for (Block block : event.getBlocks())
{
- if (((block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (((block.getTypeId() == WALL_SIGN
+ || block.getTypeId() == SIGN_POST)
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
|| EssentialsSign.checkIfBlockBreaksSigns(block))
{
@@ -225,11 +229,16 @@ public class SignBlockListener implements Listener
@EventHandler(priority = EventPriority.LOW)
public void onBlockPistonRetract(final BlockPistonRetractEvent event)
{
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
+
if (event.isSticky())
{
final Block block = event.getBlock();
- if (((block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (((block.getTypeId() == WALL_SIGN
+ || block.getTypeId() == SIGN_POST)
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
|| EssentialsSign.checkIfBlockBreaksSigns(block))
{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java
index 5907442d9..a50ce967a 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java
@@ -41,7 +41,7 @@ public class SignEnchant extends EssentialsSign
}
catch (NumberFormatException ex)
{
- throw new SignException(ex.getMessage());
+ throw new SignException(ex.getMessage(), ex);
}
if (level < 1 || level > enchantment.getMaxLevel())
{
@@ -57,7 +57,7 @@ public class SignEnchant extends EssentialsSign
}
catch (Throwable ex)
{
- throw new SignException(ex.getMessage());
+ throw new SignException(ex.getMessage(), ex);
}
getTrade(sign, 3, ess);
return true;
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
index a0446179f..edc5b856d 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
@@ -22,10 +22,15 @@ public class SignEntityListener implements Listener
@EventHandler(priority = EventPriority.LOW)
public void onEntityExplode(final EntityExplodeEvent event)
{
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
+
for (Block block : event.blockList())
{
- if (((block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (((block.getTypeId() == Material.WALL_SIGN.getId()
+ || block.getTypeId() == Material.SIGN_POST.getId())
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
|| EssentialsSign.checkIfBlockBreaksSigns(block))
{
@@ -43,17 +48,17 @@ public class SignEntityListener implements Listener
}
}
- @EventHandler(priority = EventPriority.LOW)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityChangeBlock(final EntityChangeBlockEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled())
{
return;
}
final Block block = event.getBlock();
- if (((block.getType() == Material.WALL_SIGN
- || block.getType() == Material.SIGN_POST)
+ if (((block.getTypeId() == Material.WALL_SIGN.getId()
+ || block.getTypeId() == Material.SIGN_POST.getId())
&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
|| EssentialsSign.checkIfBlockBreaksSigns(block))
{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
index f891c0fdb..d415ef6a8 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
@@ -20,26 +20,22 @@ public class SignPlayerListener implements Listener
this.ess = ess;
}
- @EventHandler(priority = EventPriority.LOW)
+ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerInteract(final PlayerInteractEvent event)
{
- if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+ if (ess.getSettings().areSignsDisabled() || event.getAction() != Action.RIGHT_CLICK_BLOCK)
{
return;
}
-
final Block block = event.getClickedBlock();
if (block == null)
{
return;
}
+
final int mat = block.getTypeId();
if (mat == Material.SIGN_POST.getId() || mat == Material.WALL_SIGN.getId())
{
- if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
- {
- return;
- }
final Sign csign = (Sign)block.getState();
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
@@ -60,7 +56,6 @@ public class SignPlayerListener implements Listener
{
event.setCancelled(true);
return;
-
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
index 6ea4f5e80..41f9fb2a5 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
@@ -224,7 +224,7 @@ public class SignTrade extends EssentialsSign
}
catch (SignException e)
{
- throw new SignException(_("tradeSignEmpty"));
+ throw new SignException(_("tradeSignEmpty"), e);
}
}
diff --git a/Essentials/src/com/earth2me/essentials/user/UserBase.java b/Essentials/src/com/earth2me/essentials/user/UserBase.java
index 9dda2f950..587ed084b 100644
--- a/Essentials/src/com/earth2me/essentials/user/UserBase.java
+++ b/Essentials/src/com/earth2me/essentials/user/UserBase.java
@@ -1,7 +1,6 @@
package com.earth2me.essentials.user;
import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.craftbukkit.OfflineBedLocation;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
import java.io.File;
import lombok.Delegate;
@@ -97,11 +96,7 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
@Override
public Location getBedSpawnLocation()
{
- if (isOnlineUser()) {
- return base.getBedSpawnLocation();
- } else {
- return OfflineBedLocation.getBedLocation(base.getName(), ess);
- }
+ return base.getBedSpawnLocation();
}
@Override
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index ec1f3fc8d..cea97aa92 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -52,7 +52,7 @@ teleport-delay: 0
# The delay, in seconds, a player can't be attacked by other players after he has been teleported by a command
# This will also prevent that the player can attack other players
-teleport-invulnerability: 0
+teleport-invulnerability: 2
# The delay, in seconds, required between /heal attempts
heal-cooldown: 60
@@ -107,6 +107,8 @@ player-commands:
- balance
- balance.others
- balancetop
+ - chat.color
+ - chat.format
- chat.shout
- chat.question
- clearinventory
@@ -152,8 +154,11 @@ player-commands:
- signs.use.balance
- signs.use.buy
- signs.use.disposal
+ - signs.use.enchant
- signs.use.free
+ - signs.use.gamemode
- signs.use.heal
+ - signs.use.kit
- signs.use.mail
- signs.use.protection
- signs.use.sell
@@ -177,7 +182,7 @@ player-commands:
# Note: All items MUST be followed by a quantity!
# All kit names should be lower case, and will be treated as lower in permissions/costs.
# Syntax: - itemID[:DataValue] Amount [Enchantment:Level]..
-# Times are measured in seconds.
+# 'delay' refers to the cooldown between how often you can use each kit, measured in seconds.
kits:
dtools:
delay: 10
@@ -217,6 +222,12 @@ enabledSigns:
#- time
#- weather
#- protection
+
+
+# How many times per second can Essentials signs be interacted with.
+# Values should be between 1-20, 20 being virtually no lag protection.s
+# Lower numbers will reduce the possiblity of lag, but may annoy players.
+sign-use-per-second: 4
# Backup runs a command while saving is disabled
backup:
@@ -265,7 +276,12 @@ freeze-afk-players: false
# When the player is afk, should he be able to pickup items?
# Enable this, when you don't want people idling in mob traps.
-disable-item-pickup-while-afk: true
+disable-item-pickup-while-afk: false
+
+# Should we automatically remove afk status when the player moves?
+# Player will be removed from afk on chat/command reguardless of this setting.
+# Disable this to reduce server lag.
+cancel-afk-on-move: true
# You can disable the death messages of minecraft here
death-messages: true
@@ -274,7 +290,8 @@ death-messages: true
no-god-in-worlds:
# - world_nether
-# Set to true to enable per-world permissions for teleporting with /world, /tp ,/tpa and /tpo.
+# Set to true to enable per-world permissions for teleporting between worlds with essentials commands
+# This applies to /world, /back, /tp[a|o][here|all], but not warps.
# Give someone permission to teleport to a world with essentials.world.<worldname>
world-teleport-permissions: false
@@ -297,6 +314,9 @@ repair-enchanted: true
#If you set this to true any plugin that uses teleport will have the previous location registered.
register-back-in-listener: false
+#Delay to wait before people can cause attack damage after logging in
+login-attack-delay: 5
+
############################################################
# +------------------------------------------------------+ #
# | EssentialsHome | #
@@ -309,6 +329,11 @@ spawn-if-no-home: true
# Allows people to set their bed at daytime
update-bed-at-daytime: true
+# Set to true to enable per-world permissions for using homes to teleport between worlds
+# This applies to the /home only.
+# Give someone permission to teleport to a world with essentials.world.<worldname>
+world-home-permissions: false
+
# Allow players to have multiple homes.
# Players need essentials.sethome.multiple before they can have more than 1 home, default to 'default' below.
# Define different amounts of multiple homes for different permissions, e.g. essentials.sethome.multiple.vip
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index 2e1a331de..75d651aec 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -1,11 +1,12 @@
-#version: TeamCity
-# If you change this file, it will not be automatically updated after the next release.
+#version: teamcity
+#If you change this file, it will not be automatically updated after the next release,
#item,id,metadata
stone,1,0
sstone,1,0
smoothstone,1,0
rock,1,0
grass,2,0
+greendirt,2,0
dirt,3,0
cobblestone,4,0
cstone,4,0
@@ -564,6 +565,8 @@ sandstone,24,0
sastone,24,0
csandstone,24,1
csastone,24,1
+creepsandstone,24,1
+creepsastone,24,1
creepersandstone,24,1
creepersastone,24,1
hieroglyphicsandstone,24,1
@@ -620,6 +623,7 @@ pistonstick,29,7
pistonsbase,29,7
pistons,29,7
psticky,29,7
+pstick,29,7
spiderweb,30,0
sweb,30,0
web,30,0
@@ -896,10 +900,20 @@ wplankdoublestep,43,2
wplankdstep,43,2
plankdoublestep,43,2
plankdstep,43,2
+woodenpdoublestep,43,2
+woodenpdstep,43,2
+woodpdoublestep,43,2
+woodpdstep,43,2
wpdoublestep,43,2
-pdoublestep,43,2
wpdstep,43,2
+pdoublestep,43,2
pdstep,43,2
+woodendoublestep,43,2
+woodendstep,43,2
+wooddoublestep,43,2
+wooddstep,43,2
+wdoublestep,43,2
+wdstep,43,2
doublewoodenplankstep,43,2
dwoodenplankstep,43,2
doublewoodplankstep,43,2
@@ -908,10 +922,20 @@ doublewplankstep,43,2
dwplankstep,43,2
doubleplankstep,43,2
dplankstep,43,2
+doublewoodenpstep,43,2
+dwoodenpstep,43,2
+doublewoodpstep,43,2
+dwoodpstep,43,2
doublewpstep,43,2
dwpstep,43,2
doublepstep,43,2
dpstep,43,2
+doublewoodenstep,43,2
+dwoodenstep,43,2
+doublewoodstep,43,2
+dwoodstep,43,2
+doublewstep,43,2
+dwstep,43,2
woodenplankdoubleslab,43,2
woodenplankdslab,43,2
woodplankdoubleslab,43,2
@@ -920,10 +944,20 @@ wplankdoubleslab,43,2
wplankdslab,43,2
plankdoubleslab,43,2
plankdslab,43,2
+woodenpdoubleslab,43,2
+woodenpdslab,43,2
+woodpdoubleslab,43,2
+woodpdslab,43,2
wpdoubleslab,43,2
-pdoubleslab,43,2
wpdslab,43,2
+pdoubleslab,43,2
pdslab,43,2
+woodendoubleslab,43,2
+woodendslab,43,2
+wooddoubleslab,43,2
+wooddslab,43,2
+wdoubleslab,43,2
+wdslab,43,2
doublewoodenplankslab,43,2
dwoodenplankslab,43,2
doublewoodplankslab,43,2
@@ -932,8 +966,18 @@ doublewplankslab,43,2
dwplankslab,43,2
doubleplankslab,43,2
dplankslab,43,2
+doublewoodenpslab,43,2
+dwoodenpslab,43,2
+doublewoodpslab,43,2
+dwoodpslab,43,2
doublewpslab,43,2
dwpslab,43,2
+doublewoodenslab,43,2
+dwoodenslab,43,2
+doublewoodslab,43,2
+dwoodslab,43,2
+doublewslab,43,2
+dwslab,43,2
doublepslab,43,2
dpslab,43,2
cobblestonedoublestep,43,3
@@ -997,15 +1041,26 @@ ssstep,44,1
sanddstoneslab,44,1
sstoneslab,44,1
ssslab,44,1
+woodenplankstep,44,2
woodplankstep,44,2
wplankstep,44,2
plankstep,44,2
+woodenpstep,44,2
+woodpstep,44,2
wpstep,44,2
+woodenstep,44,2
+woodstep,44,2
+wstep,44,2
pstep,44,2
woodplankslab,44,2
wplankslab,44,2
plankslab,44,2
+woodenpslab,44,2
+woodpslab,44,2
wpslab,44,2
+woodenslab,44,2
+woodslab,44,2
+wslab,44,2
pslab,44,2
cobblestonestep,44,3
cobblestep,44,3
@@ -1058,9 +1113,13 @@ fire,51,0
flame,51,0
flames,51,0
mobspawner,52,0
+mobcage,52,0
monsterspawner,52,0
+monstercage,52,0
mspawner,52,0
+mcage,52,0
spawner,52,0
+cage,52,0
woodenstairs,53,0
woodstairs,53,0
wstairs,53,0
@@ -1302,6 +1361,12 @@ blockbamboo,83,0
jukebox,84,0
jbox,84,0
fence,85,0
+woodenfence,85,0
+woodfence,85,0
+wfence,85,0
+fencewooden,85,0
+fencewood,85,0
+fencew,85,0
pumpkin,86,0
netherrack,87,0
netherrock,87,0
@@ -1427,10 +1492,26 @@ metalbars,101,0
jailbarsblock,101,0
jailbarsb,101,0
jailbars,101,0
+mbarsblock,101,0
+mbarsb,101,0
+mbars,101,0
+jbarsblock,101,0
+jbarsb,101,0
+jbars,101,0
+ibarsb,101,0
+ibarsblock,101,0
glasspane,102,0
+glassp,102,0
+paneglass,102,0
+pglass,102,0
flatglass,102,0
+fglass,102,0
skinnyglass,102,0
+sglass,102,0
glassflat,102,0
+glassf,102,0
+glassskinny,102,0
+glasss,102,0
melon,103,0
watermelon,103,0
greenmelon,103,0
@@ -1451,34 +1532,72 @@ stemgreenmelon,105,0
vines,106,0
vine,106,0
greenvines,106,0
+greenvine,106,0
gardenvines,106,0
+gardenvine,106,0
vinesgreen,106,0
-fencegate,107,0
-woodenfence,107,0
+vinegreen,106,0
+vinesgarden,106,0
+vinegarden,106,0
+vinesg,106,0
+vineg,106,0
+gvines,106,0
+gvine,106,0
+wfencegate,107,0
+woodfencegate,107,0
woodenfencegate,107,0
-gatefence,107,0
woodengate,107,0
woodgate,107,0
+wgate,107,0
+gate,107,0
gardengate,107,0
+ggate,107,0
+fencegate,107,0
+fencegatewooden,107,0
+fencegatewood,107,0
brickstairs,108,0
redbrickstairs,108,0
+redbstairs,108,0
+rbrickstairs,108,0
bstairs,108,0
-stairsbrick,108,0
-brickstair,108,0
redstairs,108,0
+brickstair,108,0
+redbrickstair,108,0
+redbstair,108,0
+rbrickstair,108,0
+bstair,108,0
+redstair,108,0
+stairsbrick,108,0
+stairsredbrick,108,0
+stairsredb,108,0
+stairsrbrick,108,0
+stairsb,108,0
+stairsred,108,0
+stairbrick,108,0
+stairredbrick,108,0
+stairredb,108,0
+stairrbrick,108,0
+stairb,108,0
+stairred,108,0
+stairsstonebrick,109,0
stonebrickstairs,109,0
stonebstairs,109,0
sbstairs,109,0
-stairsstonebrick,109,0
cementbrickstairs,109,0
cementstairs,109,0
cementbstairs,109,0
+cbstairs,109,0
greybrickstairs,109,0
greybstairs,109,0
+greystairs,109,0
+purplegrass,110,0
+pinkgrass,110,0
mycel,110,0
mycelium,110,0
swampgrass,110,0
sgrass,110,0
+mushroomgrass,110,0
+mushgrass,110,0
waterlily,111,0
lilypad,111,0
lily,111,0
@@ -1502,7 +1621,37 @@ nbrickstairs,114,0
hellbrickstairs,114,0
deathbrickstairs,114,0
dbrickstairs,114,0
-hbrickstais,114,0
+hbrickstairs,114,0
+dstairs,114,0
+hstairs,114,0
+hellstairs,114,0
+deathstairs,114,0
+nstairs,114,0
+netherstairs,114,0
+dbstairs,114,0
+hbstairs,114,0
+hellbstairs,114,0
+deathbstairs,114,0
+nbstairs,114,0
+netherbstairs,114,0
+netherbrickstair,114,0
+nbrickstair,114,0
+hellbrickstair,114,0
+deathbrickstair,114,0
+dbrickstair,114,0
+hbrickstair,114,0
+dstair,114,0
+hstair,114,0
+hellstair,114,0
+deathstair,114,0
+nstair,114,0
+netherstair,114,0
+dbstair,114,0
+hbstair,114,0
+hellbstair,114,0
+deathbstair,114,0
+nbstair,114,0
+netherbstair,114,0
netherwarts,115,0
netherwart,115,0
netherplant,115,0
@@ -1534,6 +1683,7 @@ booktable,116,0
magicdesk,116,0
enchantmentdesk,116,0
edesk,116,0
+bookdesk,116,0
btable,116,0
bdesk,116,0
mtable,116,0
@@ -2387,8 +2537,13 @@ whitecolor,351,15
whitedye,351,15
bone,352,0
sugar,353,0
+whitedust,353,0
cake,354,0
bed,355,0
+sleepingtable,355,0
+sleeptable,355,0
+tablesleeping,355,0
+tablesleep,355,0
repeater,356,0
repeat,356,0
delayer,356,0
@@ -2402,6 +2557,10 @@ shears,359,0
shear,359,0
sheers,359,0
sheer,359,0
+woolcutters,359,0
+woolcutter,359,0
+cutterswool,359,0
+cutterwool,359,0
melonslice,360,0
mslice,360,0
slicemelon,360,0
@@ -2427,6 +2586,8 @@ uncookedbeef,363,0
uncookedsteak,363,0
cowmeat,363,0
plainbeef,363,0
+beef,364,0
+steak,364,0
cookedbeef,364,0
grilledbeef,364,0
cookedsteak,364,0
@@ -2450,7 +2611,7 @@ zombieflesh,367,0
rottenmeat,367,0
zombiemeat,367,0
badflesh,367,0
-poisenflesh,367,0
+poisonflesh,367,0
zombieremains,367,0
enderpearl,368,0
pearl,368,0
@@ -2472,6 +2633,7 @@ ghosttear,370,0
ghostdrop,370,0
gtear,370,0
gdrop,370,0
+tear,370,0
goldnugget,371,0
gnugget,371,0
goldball,371,0
@@ -2479,8 +2641,17 @@ goldpebble,371,0
gball,371,0
gpebble,371,0
pigzombienugget,371,0
+pigznugget,371,0
+pzombienugget,371,0
+pznugget,371,0
pigzombieball,371,0
+pigzball,371,0
+pzombieball,371,0
+pzball,371,0
pigzombiepebble,371,0
+pigzpebble,371,0
+pzombiepebble,371,0
+pzpebble,371,0
netherstalk,372,0
deathstalk,372,0
hellstalk,372,0
@@ -2496,7 +2667,18 @@ gbottle,374,0
gvase,374,0
vase,374,0
glassvase,374,0
-emptypotion,374,0
+emptyglassbottle,374,0
+emptybottle,374,0
+emptygbottle,374,0
+emptygvase,374,0
+emptyvase,374,0
+emptyglassvase,374,0
+eglassbottle,374,0
+ebottle,374,0
+egbottle,374,0
+egvase,374,0
+evase,374,0
+eglassvase,374,0
spidereye,375,0
eyeofspider,375,0
spiderseye,375,0
@@ -2556,32 +2738,85 @@ shiningmelon,382,0
gmelon,382,0
smelon,382,0
creeperegg,383,50
+eggcreeper,383,50
skeletonegg,383,51
+eggskeleton,383,51
spideregg,383,52
+eggspider,383,52
giantegg,383,53
+egggiant,383,53
zombieegg,383,54
+eggzombie,383,54
slimeegg,383,55
+eggslime,383,55
ghastegg,383,56
+eggghast,383,56
zombiepigmanegg,383,57
+zpigmanegg,383,57
pigmanegg,383,57
+zombiepmanegg,383,57
+zpmanegg,383,57
+zombiepigmegg,383,57
+zpigmegg,383,57
+zombiepigegg,383,57
+zpigegg,383,57
+zombiepmegg,383,57
+zombiepegg,383,57
+eggzombiepigman,383,57
+eggzpigman,383,57
+eggpigman,383,57
+eggzombiepman,383,57
+eggzpman,383,57
+eggzombiepigm,383,57
+eggzpigm,383,57
+eggzombiepig,383,57
+eggzpig,383,57
+eggzombiepm,383,57
+eggzombiep,383,57
endermanegg,383,58
+eggenderman,383,58
+eggcavespider,383,59
cavespideregg,383,59
silverfishegg,383,60
+eggsilverfish,383,60
blazeegg,383,61
+eggblaze,383,61
lavaslimeegg,383,62
-magmacubeegg,383,63
+lavacubeegg,383,62
+magmacubeegg,383,62
+magmaslimeegg,383,62
+egglavaslime,383,62
+egglavacube,383,62
+eggmagmacube,383,62
+eggmagmaslime,383,62
pigegg,383,90
+eggpig,383,90
sheepegg,383,91
+eggsheep,383,91
cowegg,383,92
+eggcow,383,92
chickenegg,383,93
+eggchicken,383,93
squidegg,383,94
+eggsquid,383,94
wolfegg,383,95
+eggwolf,383,95
mooshroomegg,383,96
mushroomcowegg,383,96
+eggmooshroom,383,96
+eggmushroomcow,383,96
snowgolemegg,383,97
+sgolemegg,383,97
+eggsnowgolem,383,97
+eggsgolem,383,97
ocelotegg,383,98
+eggocelot,383,98
irongolemegg,383,99
+igolemegg,383,99
+eggirongolem,383,99
+eggigolem,383,99
villageregg,383,120
+eggvillager,383,120
bottleofenchanting,384,0
enchantingbottle,384,0
expbottle,384,0
@@ -2591,48 +2826,541 @@ fireball,385,0
grenade,385,0
goldmusicrecord,2256,0
goldmusicdisk,2256,0
+goldmusicdisc,2256,0
goldmusiccd,2256,0
+13musicrecord,2256,0
+13musicdisk,2256,0
+13musicdisc,2256,0
+13musiccd,2256,0
gomusicrecord,2256,0
gomusicdisk,2256,0
+gomusicdisc,2256,0
gomusiccd,2256,0
goldmrecord,2256,0
goldmdisk,2256,0
+goldmdisc,2256,0
goldmcd,2256,0
+13mrecord,2256,0
+13mdisk,2256,0
+13mdisc,2256,0
+13mcd,2256,0
gomrecord,2256,0
gomdisk,2256,0
+gomdisc,2256,0
gomcd,2256,0
goldrecord,2256,0
golddisk,2256,0
+golddisc,2256,0
goldcd,2256,0
+13record,2256,0
+13disk,2256,0
+13disc,2256,0
+13cd,2256,0
gorecord,2256,0
godisk,2256,0
+godisc,2256,0
gocd,2256,0
record1,2256,0
+disk1,2256,0
+disc1,2256,0
+cd1,2256,0
+1record,2256,0
+1disk,2256,0
+1disc,2256,0
+1cd,2256,0
greenmusicrecord,2257,0
greenmusicdisk,2257,0
+greenmusicdisc,2257,0
greenmusiccd,2257,0
+catmusicrecord,2257,0
+catmusicdisk,2257,0
+catmusicdisc,2257,0
+catmusiccd,2257,0
grmusicrecord,2257,0
grmusicdisk,2257,0
+grmusicdisc,2257,0
grmusiccd,2257,0
greenmrecord,2257,0
greenmdisk,2257,0
+greenmdisc,2257,0
greenmcd,2257,0
+catmrecord,2257,0
+catmdisk,2257,0
+catmdisc,2257,0
+catmcd,2257,0
grmrecord,2257,0
grmdisk,2257,0
+grmdisc,2257,0
grmcd,2257,0
greenrecord,2257,0
greendisk,2257,0
+greendisc,2257,0
greencd,2257,0
+catrecord,2257,0
+catdisk,2257,0
+catdisc,2257,0
+catcd,2257,0
grrecord,2257,0
grdisk,2257,0
+grdisc,2257,0
grcd,2257,0
record2,2257,0
+disk2,2257,0
+disc2,2257,0
+cd2,2257,0
+2record,2257,0
+2disk,2257,0
+2disc,2257,0
+2cd,2257,0
+orangemusicrecord,2258,0
+orangemusicdisk,2258,0
+orangemusicdisc,2258,0
+orangemusiccd,2258,0
+blocksmusicrecord,2258,0
+blocksmusicdisk,2258,0
+blocksmusicdisc,2258,0
+blocksmusiccd,2258,0
+ormusicrecord,2258,0
+ormusicdisk,2258,0
+ormusicdisc,2258,0
+ormusiccd,2258,0
+orangemrecord,2258,0
+orangemdisk,2258,0
+orangemdisc,2258,0
+orangemcd,2258,0
+blocksmrecord,2258,0
+blocksmdisk,2258,0
+blocksmdisc,2258,0
+blocksmcd,2258,0
+ormrecord,2258,0
+ormdisk,2258,0
+ormdisc,2258,0
+ormcd,2258,0
+orangerecord,2258,0
+orangedisk,2258,0
+orangedisc,2258,0
+orangecd,2258,0
+blocksrecord,2258,0
+blocksdisk,2258,0
+blocksdisc,2258,0
+blockscd,2258,0
+orrecord,2258,0
+ordisk,2258,0
+ordisc,2258,0
+orcd,2258,0
record3,2258,0
+disk3,2258,0
+disc3,2258,0
+cd3,2258,0
+3record,2258,0
+3disk,2258,0
+3disc,2258,0
+3cd,2258,0
+redmusicrecord,2259,0
+redmusicdisk,2259,0
+redmusicdisc,2259,0
+redmusiccd,2259,0
+chripmusicrecord,2259,0
+chripmusicdisk,2259,0
+chripmusicdisc,2259,0
+chripmusiccd,2259,0
+remusicrecord,2259,0
+remusicdisk,2259,0
+remusicdisc,2259,0
+remusiccd,2259,0
+redmrecord,2259,0
+redmdisk,2259,0
+redmdisc,2259,0
+redmcd,2259,0
+chripmrecord,2259,0
+chripmdisk,2259,0
+chripmdisc,2259,0
+chripmcd,2259,0
+remrecord,2259,0
+remdisk,2259,0
+remdisc,2259,0
+remcd,2259,0
+redrecord,2259,0
+reddisk,2259,0
+reddisc,2259,0
+redcd,2259,0
+chriprecord,2259,0
+chripdisk,2259,0
+chripdisc,2259,0
+chripcd,2259,0
+rerecord,2259,0
+redisk,2259,0
+redisc,2259,0
+recd,2259,0
record4,2259,0
+disk4,2259,0
+disc4,2259,0
+cd4,2259,0
+4record,2259,0
+4disk,2259,0
+4disc,2259,0
+4cd,2259,0
+lightgreenmusicrecord,2260,0
+lightgreenmusicdisk,2260,0
+lightgreenmusicdisc,2260,0
+lightgreenmusiccd,2260,0
+lgreenmusicrecord,2260,0
+lgreenmusicdisk,2260,0
+lgreenmusicdisc,2260,0
+lgreenmusiccd,2260,0
+lightgrmusicrecord,2260,0
+lightgrmusicdisk,2260,0
+lightgrmusicdisc,2260,0
+lightgrmusiccd,2260,0
+farmusicrecord,2260,0
+farmusicdisk,2260,0
+farmusicdisc,2260,0
+farmusiccd,2260,0
+lgrmusicrecord,2260,0
+lgrmusicdisk,2260,0
+lgrmusicdisc,2260,0
+lgrmusiccd,2260,0
+lightgreenmrecord,2260,0
+lightgreenmdisk,2260,0
+lightgreenmdisc,2260,0
+lightgreenmcd,2260,0
+lgreenmrecord,2260,0
+lgreenmdisk,2260,0
+lgreenmdisc,2260,0
+lgreenmcd,2260,0
+lightgrmrecord,2260,0
+lightgrmdisk,2260,0
+lightgrmdisc,2260,0
+lightgrmcd,2260,0
+farmrecord,2260,0
+farmdisk,2260,0
+farmdisc,2260,0
+farmcd,2260,0
+lgrmrecord,2260,0
+lgrmdisk,2260,0
+lgrmdisc,2260,0
+lgrmcd,2260,0
+lightgreenrecord,2260,0
+lightgreendisk,2260,0
+lightgreendisc,2260,0
+lightgreencd,2260,0
+lgreenrecord,2260,0
+lgreendisk,2260,0
+lgreendisc,2260,0
+lgreencd,2260,0
+lightgrrecord,2260,0
+lightgrdisk,2260,0
+lightgrdisc,2260,0
+lightgrcd,2260,0
+farrecord,2260,0
+fardisk,2260,0
+fardisc,2260,0
+farcd,2260,0
+lgrrecord,2260,0
+lgrdisk,2260,0
+lgrdisc,2260,0
+lgrcd,2260,0
record5,2260,0
+disk5,2260,0
+disc5,2260,0
+cd5,2260,0
+5record,2260,0
+5disk,2260,0
+5disc,2260,0
+5cs,2260,0
+purplemusicrecord,2261,0
+purplemusicdisk,2261,0
+purplemusicdisc,2261,0
+purplemusiccd,2261,0
+mallmusicrecord,2261,0
+mallmusicdisk,2261,0
+mallmusicdisc,2261,0
+mallmusiccd,2261,0
+pumusicrecord,2261,0
+pumusicdisk,2261,0
+pumusicdisc,2261,0
+pumusiccd,2261,0
+purplemrecord,2261,0
+purplemdisk,2261,0
+purplemdisc,2261,0
+purplemcd,2261,0
+mallmrecord,2261,0
+mallmdisk,2261,0
+mallmdisc,2261,0
+mallmcd,2261,0
+pumrecord,2261,0
+pumdisk,2261,0
+pumdisc,2261,0
+pumcd,2261,0
+purplerecord,2261,0
+purpledisk,2261,0
+purpledisc,2261,0
+purplecd,2261,0
+mallrecord,2261,0
+malldisk,2261,0
+malldisc,2261,0
+mallcd,2261,0
+purecord,2261,0
+pudisk,2261,0
+pudisc,2261,0
+pucd,2261,0
record6,2261,0
+disk6,2261,0
+disc6,2261,0
+cd6,2261,0
+6record,2261,0
+6disk,2261,0
+6disc,2261,0
+6cd,2261,0
+pinkmusicrecord,2262,0
+pinkmusicdisk,2262,0
+pinkmusicdisc,2262,0
+pinkmusiccd,2262,0
+mellohimusicrecord,2262,0
+mellohimusicdisk,2262,0
+mellohimusicdisc,2262,0
+mellohimusiccd,2262,0
+pimusicrecord,2262,0
+pimusicdisk,2262,0
+pimusicdisc,2262,0
+pimusiccd,2262,0
+pinkmrecord,2262,0
+pinkmdisk,2262,0
+pinkmdisc,2262,0
+pinkmcd,2262,0
+mellohimrecord,2262,0
+mellohimdisk,2262,0
+mellohimdisc,2262,0
+mellohimcd,2262,0
+pimrecord,2262,0
+pimdisk,2262,0
+pimdisc,2262,0
+pimcd,2262,0
+pinkrecord,2262,0
+pinkdisk,2262,0
+pinkdisc,2262,0
+pinkcd,2262,0
+mellohirecord,2262,0
+mellohidisk,2262,0
+mellohidisc,2262,0
+mellohicd,2262,0
+pirecord,2262,0
+pidisk,2262,0
+pidisc,2262,0
+picd,2262,0
record7,2262,0
+disk7,2262,0
+disc7,2262,0
+cd7,2262,0
+7record,2262,0
+7disk,2262,0
+7disc,2262,0
+7cd,2262,0
+blackmusicrecord,2263,0
+blackmusicdisk,2263,0
+blackmusicdisc,2263,0
+blackmusiccd,2263,0
+stalmusicrecord,2263,0
+stalmusicdisk,2263,0
+stalmusicdisc,2263,0
+stalmusiccd,2263,0
+blmusicrecord,2263,0
+blmusicdisk,2263,0
+blmusicdisc,2263,0
+blmusiccd,2263,0
+blackmrecord,2263,0
+blackmdisk,2263,0
+blackmdisc,2263,0
+blackmcd,2263,0
+stalmrecord,2263,0
+stalmdisk,2263,0
+stalmdisc,2263,0
+stalmcd,2263,0
+blmrecord,2263,0
+blmdisk,2263,0
+blmdisc,2263,0
+blmcd,2263,0
+blackrecord,2263,0
+blackdisk,2263,0
+blackdisc,2263,0
+blackcd,2263,0
+stalrecord,2263,0
+staldisk,2263,0
+staldisc,2263,0
+stalcd,2263,0
+blrecord,2263,0
+bldisk,2263,0
+bldisc,2263,0
+blcd,2263,0
record8,2263,0
+disk8,2263,0
+disc8,2263,0
+cd8,2263,0
+8record,2263,0
+8disk,2263,0
+8disc,2263,0
+8cd,2263,0
+whitemusicrecord,2264,0
+whitemusicdisk,2264,0
+whitemusicdisc,2264,0
+whitemusiccd,2264,0
+stradmusicrecord,2264,0
+stradmusicdisk,2264,0
+stradmusicdisc,2264,0
+stradmusiccd,2264,0
+whmusicrecord,2264,0
+whmusicdisk,2264,0
+whmusicdisc,2264,0
+whmusiccd,2264,0
+whitemrecord,2264,0
+whitemdisk,2264,0
+whitemdisc,2264,0
+whitemcd,2264,0
+stradmrecord,2264,0
+stradmdisk,2264,0
+stradmdisc,2264,0
+stradmcd,2264,0
+whmrecord,2264,0
+whmdisk,2264,0
+whmdisc,2264,0
+whmcd,2264,0
+whiterecord,2264,0
+whitedisk,2264,0
+whitedisc,2264,0
+whitecd,2264,0
+stradrecord,2264,0
+straddisk,2264,0
+straddisc,2264,0
+stradcd,2264,0
+whrecord,2264,0
+whdisk,2264,0
+whdisc,2264,0
+whcd,2264,0
record9,2264,0
+disk9,2264,0
+disc9,2264,0
+cd9,2264,0
+9record,2264,0
+9disk,2264,0
+9disc,2264,0
+9cd,2264,0
+darkgreenmusicrecord,2265,0
+darkgreenmusicdisk,2265,0
+darkgreenmusicdisc,2265,0
+darkgreenmusiccd,2265,0
+dgreenmusicrecord,2265,0
+dgreenmusicdisk,2265,0
+dgreenmusicdisc,2265,0
+dgreenmusiccd,2265,0
+darkgrmusicrecord,2265,0
+darkgrmusicdisk,2265,0
+darkgrmusicdisc,2265,0
+darkgrmusiccd,2265,0
+wardmusicrecord,2265,0
+wardmusicdisk,2265,0
+wardmusicdisc,2265,0
+wardmusiccd,2265,0
+dgrmusicrecord,2265,0
+dgrmusicdisk,2265,0
+dgrmusicdisc,2265,0
+dgrmusiccd,2265,0
+darkgreenmrecord,2265,0
+darkgreenmdisk,2265,0
+darkgreenmdisc,2265,0
+darkgreenmcd,2265,0
+dgreenmrecord,2265,0
+dgreenmdisk,2265,0
+dgreenmdisc,2265,0
+dgreenmcd,2265,0
+darkgrmrecord,2265,0
+darkgrmdisk,2265,0
+darkgrmdisc,2265,0
+darkgrmcd,2265,0
+wardmrecord,2265,0
+wardmdisk,2265,0
+wardmdisc,2265,0
+wardmcd,2265,0
+dgrmrecord,2265,0
+dgrmdisk,2265,0
+dgrmdisc,2265,0
+dgrmcd,2265,0
+darkgreenrecord,2265,0
+darkgreendisk,2265,0
+darkgreendisc,2265,0
+darkgreencd,2265,0
+dgreenrecord,2265,0
+dgreendisk,2265,0
+dgreendisc,2265,0
+dgreencd,2265,0
+darkgrrecord,2265,0
+darkgrdisk,2265,0
+darkgrdisc,2265,0
+darkgrcd,2265,0
+wardrecord,2265,0
+warddisk,2265,0
+warddisc,2265,0
+wardcd,2265,0
+dgrrecord,2265,0
+dgrdisk,2265,0
+dgrdisc,2265,0
+dgrcd,2265,0
record10,2265,0
+disk10,2265,0
+disc10,2265,0
+cd10,2265,0
+10record,2265,0
+10disk,2265,0
+10disc,2265,0
+10cs,2265,0
+crackedmusicrecord,2266,0
+crackedmusicdisk,2266,0
+crackedmusicdisc,2266,0
+crackedmusiccd,2266,0
+crackmusicrecord,2266,0
+crackmusicdisk,2266,0
+crackmusicdisc,2266,0
+crackmusiccd,2266,0
+11musicrecord,2266,0
+11musicdisk,2266,0
+11musicdisc,2266,0
+11musiccd,2266,0
+cmusicrecord,2266,0
+cmusicdisk,2266,0
+cmusicdisc,2266,0
+cmusiccd,2266,0
+crackedmrecord,2266,0
+crackedmdisk,2266,0
+crackedmdisc,2266,0
+crackedmcd,2266,0
+crackmrecord,2266,0
+crackmdisk,2266,0
+crackmdisc,2266,0
+crackmcd,2266,0
+11mrecord,2266,0
+11mdisk,2266,0
+11mdisc,2266,0
+11mcd,2266,0
+cmrecord,2266,0
+cmdisk,2266,0
+cmdisc,2266,0
+cmcd,2266,0
+crackedrecord,2266,0
+crackeddisk,2266,0
+crackeddisc,2266,0
+crackedcd,2266,0
+crackrecord,2266,0
+crackdisk,2266,0
+crackdisc,2266,0
+crackcd,2266,0
+crecord,2266,0
+cdisk,2266,0
+cdisc,2266,0
+ccd,2266,0
record11,2266,0
+disk11,2266,0
+disc11,2266,0
+cd11,2266,0
+11record,2266,0
+11disk,2266,0
+11disc,2266,0
+11cd,2266,0 \ No newline at end of file
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 7707ac09a..6f0d47990 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -31,10 +31,11 @@ buildAlert=\u00a7cYou are not permitted to build
bukkitFormatChanged=Bukkit version format changed. Version not checked.
burnMsg=\u00a77You set {0} on fire for {1} seconds.
canTalkAgain=\u00a77You can talk again
-cantFindGeoIpDB=Can''t find GeoIP database!
+cantFindGeoIpDB=Can't find GeoIP database!
cantReadGeoIpDB=Failed to read GeoIP database!
cantSpawnItem=\u00a7cYou are not allowed to spawn the item {0}
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
commandFailed=Command {0} failed:
commandHelpFailedForPlugin=Error getting help for: {0}
@@ -42,7 +43,7 @@ commandNotLoaded=\u00a7cCommand {0} is improperly loaded.
compassBearing=\u00a77Bearing: {0} ({1} degrees).
configFileMoveError=Failed to move config.yml to backup location.
configFileRenameError=Failed to rename temp file to config.yml
-connectedPlayers=Connected players:
+connectedPlayers=Connected players:
connectionFailed=Failed to open connection.
cooldownWithMessage=\u00a7cCooldown: {0}
corruptNodeInConfig=\u00a74Notice: Your configuration file has a corrupt {0} node.
@@ -51,6 +52,7 @@ creatingConfigFromTemplate=Creating config from template: {0}
creatingEmptyConfig=Creating empty config: {0}
creative=creative
currency={0}{1}
+currentWorld=Current World: {0}
day=day
days=days
defaultBanReason=The Ban Hammer has spoken!
@@ -72,6 +74,7 @@ disabledToSpawnMob=Spawning this mob was disabled in the config file.
dontMoveMessage=\u00a77Teleportation will commence in {0}. Don''t move.
downloadingGeoIp=Downloading GeoIP database ... this might take a while (country: 0.6 MB, city: 20MB)
duplicatedUserdata=Duplicated userdata: {0} and {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
enableUnlimited=\u00a77Giving unlimited amount of {0} to {1}.
enabled=enabled
enchantmentApplied = \u00a77The enchantment {0} has been applied to your item in hand.
@@ -84,16 +87,19 @@ errorWithMessage=\u00a7cError: {0}
essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
essentialsReload=\u00a77Essentials Reloaded {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
extinguish=\u00a77You extinguished yourself.
extinguishOthers=\u00a77You extinguished {0}.
failedToCloseConfig=Failed to close config {0}
failedToCreateConfig=Failed to create config {0}
failedToWriteConfig=Failed to write config {0}
-false=false
+false=\u00a74false\u00a7f
feed=\u00a77Your appetite was sated.
feedOther=\u00a77Satisfied {0}.
fileRenameError=Renaming file {0} failed
flyMode=\u00a77Set fly mode {0} for {1}.
+flying=flying
foreverAlone=\u00a7cYou have nobody to whom you can reply.
freedMemory=Freed {0} MB.
gameMode=\u00a77Set game mode {0} for {1}.
@@ -108,6 +114,10 @@ geoipJoinFormat=Player {0} comes from {1}
godDisabledFor=disabled for {0}
godEnabledFor=enabled for {0}
godMode=\u00a77God mode {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
haveBeenReleased=\u00a77You have been released
heal=\u00a77You have been healed.
healOther=\u00a77Healed {0}.
@@ -136,8 +146,8 @@ invRestored=Your inventory has been restored.
invSee=You see the inventory of {0}.
invSeeHelp=Use /invsee to restore your inventory.
invalidCharge=\u00a7cInvalid charge.
-invalidHome=Home {0} doesn't exist
-invalidMob=Invalid mob type.&
+invalidHome=Home {0} doesn''t exist
+invalidMob=Invalid mob type.
invalidServer=Invalid server!
invalidSignLine=Line {0} on sign is invalid.
invalidWorld=\u00a7cInvalid world.
@@ -161,9 +171,10 @@ jailReleased=\u00a77Player \u00a7e{0}\u00a77 unjailed.
jailReleasedPlayerNotify=\u00a77You have been released!
jailSentenceExtended=Jail time extend to: {0)
jailSet=\u00a77Jail {0} has been set
-jumpError=That would hurt your computer''s brain.
+jumpError=That would hurt your computer's brain.
kickDefault=Kicked from server
kickExempt=\u00a7cYou can not kick that person.
+kickedAll=\u00a7cKicked all players from server
kill=\u00a77Killed {0}.
kitError2=\u00a7cThat kit does not exist or is improperly defined.
kitError=\u00a7cThere are no valid kits.
@@ -222,6 +233,7 @@ noAccessCommand=\u00a7cYou do not have access to that command.
noAccessPermission=\u00a7cYou do not have permission to access that {0}.
noBreakBedrock=You are not allowed to destroy bedrock.
noDestroyPermission=\u00a7cYou do not have permission to destroy that {0}.
+noDurability=\u00a7cThis item does not have a durability.
noGodWorldWarning=\u00a7cWarning! God mode in this world disabled.
noHelpFound=\u00a7cNo matching commands.
noHomeSet=You have not set a home.
@@ -233,7 +245,7 @@ noMotd=\u00a7cThere is no message of the day.
noNewMail=\u00a77You have no new mail.
noPendingRequest=You do not have a pending request.
noPerm=\u00a7cYou do not have the \u00a7f{0}\u00a7c permission.
-noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
+noPermToSpawnMob=\u00a7cYou don't have permission to spawn this mob.
noPlacePermission=\u00a7cYou do not have permission to place a block near that sign.
noPowerTools=You have no power tools assigned.
noRules=\u00a7cThere are no rules specified yet.
@@ -243,6 +255,7 @@ notAllowedToQuestion=\u00a7cYou are not authorized to use question.
notAllowedToShout=\u00a7cYou are not authorized to shout.
notEnoughExperience=You do not have enough experience.
notEnoughMoney=You do not have sufficient funds.
+notFlying=not flying
notRecommendedBukkit= * ! * Bukkit version is not the recommended build for Essentials.
notSupportedYet=Not supported yet.
nothingInHand = \u00a7cYou have nothing in your hand.
@@ -256,7 +269,7 @@ orderBalances=Ordering balances of {0} users, please wait ...
pTimeCurrent=\u00a7e{0}''s\u00a7f time is {1}.
pTimeCurrentFixed=\u00a7e{0}''s\u00a7f time is fixed to {1}.
pTimeNormal=\u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission=\u00a7cYou are not authorized to set other players'' time.
+pTimeOthersPermission=\u00a7cYou are not authorized to set other players' time.
pTimePlayers=These players have their own time:
pTimeReset=Player time has been reset for: \u00a7e{0}
pTimeSet=Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
@@ -276,7 +289,7 @@ playerNotFound=\u00a7cPlayer not found.
playerUnmuted=\u00a77You have been unmuted
pong=Pong!
possibleWorlds=\u00a77Possible worlds are the numbers 0 through {0}.
-powerToolAir=Command can''t be attached to air.
+powerToolAir=Command can't be attached to air.
powerToolAlreadySet=Command \u00a7c{0}\u00a7f is already assigned to {1}.
powerToolAttach=\u00a7c{0}\u00a7f command assigned to {1}.
powerToolClearAll=All powertool commands have been cleared.
@@ -356,12 +369,13 @@ timeSet=Time set in all worlds.
timeSetPermission=\u00a7cYou are not authorized to set the time.
timeWorldCurrent=The current time in {0} is \u00a73{1}
timeWorldSet=The time was set to {0} in: \u00a7c{1}
+tps=Current TPS = {0}
tradeCompleted=\u00a77Trade completed.
tradeSignEmpty=The trade sign has nothing available for you.
tradeSignEmptyOwner=There is nothing to collect from this trade sign.
treeFailure=\u00a7cTree generation failure. Try again on grass or dirt.
treeSpawned=\u00a77Tree spawned.
-true=true
+true=\u00a72true\u00a7f
typeTpaccept=\u00a77To teleport, type \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77To deny this request, type \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77You can also type the name of a specific world.
@@ -375,6 +389,8 @@ unknownItemName=Unknown item name: {0}
unlimitedItemPermission=\u00a7cNo permission for unlimited item {0}.
unlimitedItems=Unlimited items:
unmutedPlayer=Player {0} unmuted.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
upgradingFilesError=Error while upgrading the files
userDoesNotExist=The user {0} does not exist.
userIsAway={0} is now AFK
@@ -384,6 +400,7 @@ userUsedPortal={0} used an existing exit portal.
userdataMoveBackError=Failed to move userdata/{0}.tmp to userdata/{1}
userdataMoveError=Failed to move userdata/{0} to userdata/{1}.tmp
usingTempFolderForTesting=Using temp folder for testing:
+vanished=\u00a7aYou have now been vanished.
versionMismatch=Version mismatch! Please update {0} to the same version.
versionMismatchAll=Version mismatch! Please update all Essentials jars to the same version.
voiceSilenced=\u00a77Your voice has been silenced
@@ -400,20 +417,22 @@ weatherStorm=\u00a77You set the weather to storm in {0}
weatherStormFor=\u00a77You set the weather to storm in {0} for {1} seconds
weatherSun=\u00a77You set the weather to sun in {0}
weatherSunFor=\u00a77You set the weather to sun in {0} for {1} seconds
-whoisBanned=\u00a79 - Banned: {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Gamemode: {0}
-whoisGeoLocation=\u00a79 - Location: {0}
-whoisGod=\u00a79 - God mode: {0}
-whoisHealth=\u00a79 - Health: {0}/20
-whoisIPAddress=\u00a79 - IP Address: {0}
-whoisIs={0} is {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Location: ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Money: {0}
-whoisOP=\u00a79 - OP: {0}
-whoisStatusAvailable=\u00a79 - Status: Available
-whoisStatusAway=\u00a79 - Status: \u00a7cAway\u00a7f
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banned:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Gamemode:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Location:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Health:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP Address:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Location:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Money:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
worth=\u00a77Stack of {0} worth \u00a7c{1}\u00a77 ({2} item(s) at {3} each)
worthMeta=\u00a77Stack of {0} with metadata of {1} worth \u00a7c{2}\u00a77 ({3} item(s) at {4} each)
worthSet=Worth value set
@@ -421,3 +440,5 @@ year=year
years=years
youAreHealed=\u00a77You have been healed.
youHaveNewMail=\u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
new file mode 100644
index 000000000..1dbb58af0
--- /dev/null
+++ b/Essentials/src/messages_cs.properties
@@ -0,0 +1,447 @@
+#version: TeamCity
+# Single quotes have to be doubled: ''
+# Translations start here
+# 0.1 version: tomasara413 - Tento preklad neni 100% presny to se opravi v dalsich verzich prekladu
+# 0.2 version: optimized by mdojcar (modojcar@seznam.cz) - mirne fixy a trochu jsem preklad vylepsil
+# nektere vyrazy jako "Kicknut" jsou v anglickem zneni (zni to mnohem prirozeneji)
+# 0.3 tommymortago - Pro upravy kontaktujte na skype: tomasperzl/ Korektura: Sejsel
+action=* {0} {1}
+addedToAccount=\u00a7a{0} bylo pripsano na tvuj ucet.
+addedToOthersAccount=\u00a7a{0} bylo pripsano na {1}\u00a7a ucet. Nova hodnota: {2}
+alertBroke=zniceno:
+alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} v: {3}
+alertPlaced=polozeno:
+alertUsed=pouzito:
+autoAfkKickReason=Byl jsi vyhozen za neaktivitu delsi nez {0} minut.
+backAfterDeath=\u00a77Pouzij /back, aby ses vratil na misto sve smrti.
+backUsageMsg=\u00a77Vracis se na svou minulou pozici.
+backupDisabled=Externi zalohovaci script neni nastaven.
+backupFinished=Zaloha dokoncena
+backupStarted=Probiha zaloha
+balance=\u00a77Ucet: {0}
+balanceTop=\u00a77Nejbohatsi hraci ({0})
+banExempt=\u00a7cNemuzes zabanovat tohoto hrace.
+banFormat=Banned: {0}
+banIpAddress=\u00a77IP Adresa byla zabanovana
+bannedIpsFileError=Chyba pri nacitani banned-ips.txt
+bannedIpsFileNotFound=Soubor banned-ips.txt nebyl nazen.
+bannedPlayersFileError=Chyba pri nacitani banned-players.txt
+bannedPlayersFileNotFound=Soubor banned-players.txt nebyl nalezen
+bigTreeFailure=\u00a7cProblem pri vytvareni velkeho stromu. Zkuste znovu na trave nebo hline.
+bigTreeSuccess= \u00a77Velky strom vytvoren.
+blockList=Essentials prenechal nasledujici prikazy jinemu pluginu:
+broadcast=[\u00a7cSdeleni\u00a7f]\u00a7a {0}
+buildAlert=\u00a7cNemas dovoleno stavet.
+bukkitFormatChanged=Format kontroly verze Bukkitu zmenen. Verze nebyla zkontrolovana.
+burnMsg=\u00a77Zapalil jsi {0} na dobu {1} sekund.
+canTalkAgain=\u00a77Muzes opet mluvit.
+cantFindGeoIpDB=Nemohu najit GeoIP databazi!
+cantReadGeoIpDB=Nemohu precist GeoIP databazi!
+cantSpawnItem=\u00a7cNejsi dovoleny spawnout item: {0}
+chatTypeLocal=[L]
+chatTypeAdmin=[A]
+chatTypeSpy=[Spy]
+commandFailed=Prikaz {0} selhal.
+commandHelpFailedForPlugin=Chyba pri ziskavani pomoci: {0}
+commandNotLoaded=\u00a7cPrikaz {0} je nespravne nacteny.
+compassBearing=\u00a77Zmena orientace: {0} ({1} stupnu).
+configFileMoveError=Chyba pri presouvani config.yml do slozky se zalohou.
+configFileRenameError=Chyba pri pokusu o prejmenovani docasneho souboru na config.yml
+connectedPlayers=Pripojeni hraci:
+connectionFailed=Pokus o otevreni spojeni selhal.
+cooldownWithMessage=\u00a7cOdpocet: {0}
+corruptNodeInConfig=\u00a74Pozor: Vas konfiguracni soubor ma chybnou {0} poznamku.
+couldNotFindTemplate=Nemohu naleznout sablonu: {0}
+creatingConfigFromTemplate=Vytvarim config ze sablony: {0}
+creatingEmptyConfig=Vytvarim prazdny config: {0}
+creative=creative
+currency={0}{1}
+currentWorld=Current World: {0}
+day=den
+days=dny
+defaultBanReason=Banovaci kladivo promluvilo!
+deleteFileError=Nemohu smazat soubor: {0}
+deleteHome=\u00a77Domov {0} byl uspesne odstranen.
+deleteJail=\u00a77Jail {0} byl uspesne odstranen.
+deleteWarp=\u00a77Warp {0} byl uspesne odstranen.
+deniedAccessCommand=Hraci {0} byl zablokovan prikaz.
+dependancyDownloaded=[Essentials] Zavislost {0} uspesne stazena.
+dependancyException=[Essentials] Nastala chyba pri pokusu o stazeni zavilosti.
+dependancyNotFound=[Essentials] Pozadovana zavilost nenalezena, stahuji nyni.
+depth=\u00a77Jsi na urovni more.
+depthAboveSea=\u00a77Jsi {0} kostek nad urovni more.
+depthBelowSea=\u00a77Jsi {0} kostek pod urovni more.
+destinationNotSet=Destinace neni nastavena.
+disableUnlimited=\u00a77Zablokovano neomezene pokladani {0} hraci {1}.
+disabled=zablokovano
+disabledToSpawnMob=Spawnuti tohoto moba je zakazno v configuracnim souboru.
+dontMoveMessage=\u00a77Teleport bude zahajen za {0}. Nehybej se.
+downloadingGeoIp=Stahuji GeoIP databazi ... muze to chvilku trvat (staty: 0.6 MB, mesta: 20MB)
+duplicatedUserdata=Duplikovane data hrace: {0} and {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
+enableUnlimited=\u00a77Davam neomezene mnozstvi {0} hraci {1}.
+enabled=povoleno
+enchantmentApplied = \u00a77Enchant {0} byl aplikovan na tvuj nastroj v ruce.
+enchantmentNotFound = \u00a7cTento enchant neexistuje
+enchantmentPerm = \u00a7cNemas opravneni na enchant: {0}
+enchantmentRemoved = \u00a77Enchant {0} byl odstranen z tveho nastroje v ruce.
+enchantments = \u00a77Enchantmenty: {0}
+errorCallingCommand=Chyba pri volani prikazu /{0}
+errorWithMessage=\u00a7cChyba: {0}
+essentialsHelp1=Soubor je poskozen a Essentials jej nemuze otevrit. Essentials jsou zablokovany. Pokud nemuzete soubor opravit sami, navstivte http://tiny.cc/EssentialsChat
+essentialsHelp2=Soubor je poskozen a Essentials jej nemuze otevrit. Essentials jsou zablokovany. Pokud nemuzete soubor opravit sami, pak napiste /essentialshelp ve hre nebo navstivte http://tiny.cc/EssentialsChat
+essentialsReload=\u00a77Essentials znovu nacteny. {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
+extinguish=\u00a77Uhasil ses.
+extinguishOthers=\u00a77Uhasil jsi hrace {0}.
+failedToCloseConfig=Chyba pri uzavreni configu {0}
+failedToCreateConfig=Chyba pri vytvoreni configu {0}
+failedToWriteConfig=Chyba pri zapisovani do configu {0}
+false=\u00a74false\u00a7f
+feed=\u00a77Nasytil jsi se.
+feedOther=\u00a77Nasytil jsi hrace {0}.
+fileRenameError=Prejmenovani souboru {0} selhalo.
+flyMode=\u00a77Povolil jsi letani hraci {0} na {1}.
+flying=flying
+foreverAlone=\u00a7cNemas komu odepsat.
+freedMemory=Uvolneno {0} MB.
+gameMode=\u00a77Nastavil jsi herni mod z {0} na {1}.
+gcchunks= chunky,
+gcentities= entity
+gcfree=Volna pamet: {0} MB
+gcmax=Dostupna pamet: {0} MB
+gctotal=Vyuzita pamet: {0} MB
+geoIpUrlEmpty=Odkaz na stazeni GeoIP je prazdny.
+geoIpUrlInvalid=Odkaz na stazeni GeoIP je chybny.
+geoipJoinFormat=Hrac {0} prichazi z {1}
+godDisabledFor=zakazan pro {0}
+godEnabledFor=povolen pro {0}
+godMode=\u00a77God mode {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
+hatRemoved=\u00a7eYour hat has been removed.
+haveBeenReleased=\u00a77Byl jsi uvolnen
+heal=\u00a77Byl jsi uzdraven.
+healOther=\u00a77Uzdravil jsi hrace {0}.
+helpConsole=Pokud chces videt napovedu z konzole, napis ?.
+helpFrom=\u00a77Prikazy od{0}:
+helpLine=\u00a76/{0}\u00a7f: {1}
+helpMatching=\u00a77Prikazy odpovidajici "{0}":
+helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
+helpPages=Strana \u00a7c{0}\u00a7f z \u00a7c{1}\u00a7f:
+helpPlugin=\u00a74{0}\u00a7f: Napoveda pluginu: /help {1}
+holeInFloor=Dira v podlaze
+homeSet=\u00a77Domov nastaven.
+homeSetToBed=\u00a77Tvuj domov je nastaven na tuto postel.
+homes=Domovy: {0}
+hour=hodina
+hours=hodiny
+ignorePlayer=Odted jsi zacal ignorovat hrace {0}.
+illegalDate=Nespravny format data.
+infoChapter=Vyberte kapitolu:
+infoChapterPages=Kapitola {0}, strana \u00a7c{1}\u00a7f z \u00a7c{2}\u00a7f:
+infoFileDoesNotExist=Soubor info.txt neexistuje. Vytvarim novy.
+infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Strana \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
+infoUnknownChapter=Neznama kapitola.
+invBigger=Inventar druheho hrace je vetsi nez tvuj.
+invRestored=Tvuj inventar byl obnoven.
+invSee=Nyni mas inventar hrace {0}.
+invSeeHelp=Pouzij znovu /invsee aby jsi mel zpatky svuj inventar.
+invalidCharge=\u00a7cNeplatny poplatek.
+invalidHome=Domov {0} neexistuje.
+invalidMob=Nespravny typ moba.
+invalidServer=Nespravny server!
+invalidSignLine=Radek {0} je chybne vyplnen.
+invalidWorld=\u00a7cNespravny svet!
+inventoryCleared=\u00a77Inventar smazan.
+inventoryClearedOthers=\u00a77Inventar hrace \u00a7c{0}\u00a77 vymazan.
+is=je
+itemCannotBeSold=Tento item nelze prodat serveru.
+itemMustBeStacked=Itemy musi byt vymeneny ve stacku.
+itemNotEnough1=\u00a7cNemas dostatek tohoto itemu, aby jsi jej mohl prodat.
+itemNotEnough2=\u00a77Pokud jsi chtel prodat vsechny itemy tohoto typu, pouzij /sell nazevitemu
+itemNotEnough3=\u00a77/sell nazevnitemu -1 proda vse ale pouze jeden item atd.
+itemSellAir=Vazne jsi se pokusil prodat Vzduch? Vezmi si neco do ruky.
+itemSold=\u00a77Prodal za \u00a7c{0} \u00a77({1} {2} za cenu {3} kus)
+itemSoldConsole={0} Prodal {1} za \u00a77{2} \u00a77({3} za cenu {4} kus)
+itemSpawn=\u00a77Davam {0} {1}
+itemsCsvNotLoaded=Nelze nacist soubor items.csv.
+jailAlreadyIncarcerated=\u00a7cTento hrace ja jiz uveznen: {0}
+jailMessage=\u00a7cPorusil jsi pravidla, ted si to odsedis!
+jailNotExist=Toto vezeni neexistuje.
+jailReleased=\u00a77Hrac \u00a7e{0}\u00a77 byl propusten na svobodu.
+jailReleasedPlayerNotify=\u00a77Byl jsi propusten na svobodu!
+jailSentenceExtended=Cas ve vezeni prodlouzen na: {0)
+jailSet=\u00a77Vezeni {0} bylo vytvoreno.
+jumpError=Tohle by tvuj procesor nemusel rozdychat.
+kickDefault=Vyhozen ze serveru
+kickExempt=\u00a7cNemuzes vyhodit tuhle osobu.
+kickedAll=\u00a7cKicked all players from server
+kill=\u00a77Zabit {0}.
+kitError2=\u00a7cTento kit neexistuje, nebo je chybne definovan.
+kitError=\u00a7cNejsou zadne validni kity.
+kitErrorHelp=\u00a7cPravdepodobne item nema vyplnene mnozstvi v configu?
+kitGive=\u00a77Davam kit {0}.
+kitInvFull=\u00a7cMel jsi plny inventar, obsah kitu je na zemi.
+kitTimed=\u00a7cNemuzes pouzit tento kit po dalsich {0}.
+kits=\u00a77Kity: {0}
+lightningSmited=\u00a77Byl jsi zasazen bleskem.
+lightningUse=\u00a77Zasadil jsi bleskem hrace {0}
+listAfkTag = \u00a77[AFK]\u00a7f
+listAmount = \u00a79Je tu \u00a7c{0}\u00a79 z maxima \u00a7c{1}\u00a79 hracu online.
+listAmountHidden = \u00a79Je tu \u00a7c{0}\u00a77/{1}\u00a79 z maxima \u00a7c{2}\u00a79 hracu online.
+listGroupTag={0}\u00a7f:
+listHiddenTag = \u00a77[HIDDEN]\u00a7f
+loadWarpError=Chyba pri nacitani warpu: {0}
+localFormat=Jazyk: <{0}> {1}
+mailClear=\u00a7cPokud chces vymazat mail, napis /mail clear.
+mailCleared=\u00a77Mail vymazan!
+mailSent=\u00a77Mail odeslan!
+markMailAsRead=\u00a7cPokud chces mail oznacit jako precteny, napis /mail clear
+markedAsAway=\u00a77Jsi oznacen jako "Pryc".
+markedAsNotAway=\u00a77Jiz nejsi oznacen jako "Pryc".
+maxHomes=Nemuzes si nastavit vice nez {0} domovu.
+mayNotJail=\u00a7cNesmis uveznit tuto postavu
+me=ja
+minute=minuta
+minutes=minuty
+missingItems=Nemas {0}x {1}.
+missingPrefixSuffix=Chybi prefix nebo suffix pro {0}
+mobSpawnError=Chyba pri pokusu o zmenu mob spawneru.
+mobSpawnLimit=Pocet mobu limitovan serverem.
+mobSpawnTarget=Musis se divat na spawner.
+mobsAvailable=\u00a77Mobove: {0}
+moneyRecievedFrom=\u00a7a{0} jsi obdrzel od hrace {1}
+moneySentTo=\u00a7a{0} bylo odeslano hraci: {1}
+moneyTaken={0} bylo odebrano z tveho uctu.
+month=mesic
+months=mesice
+moreThanZero=Mnozstvi musi byt vetsi nez 0.
+msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
+muteExempt=\u00a7cTohoto hrace nemuzes umlcet.
+mutedPlayer=Hrac {0} byl umlcen.
+mutedPlayerFor=Hrac {0} umlcen za {1}.
+mutedUserSpeaks={0} se pokusil promluvit, ale je umlcen.
+nearbyPlayers=Hraci v okoli: {0}
+negativeBalanceError=Hrac nemuze mit zapornou hodnotu uctu.
+nickChanged=Nickname zmenen.
+nickDisplayName=\u00a77Musis nejdrive povolit change-displayname v Essentials configu.
+nickInUse=\u00a7cTento nick jiz nekdo ma.
+nickNamesAlpha=\u00a7cNick musi byt alfanumericky.
+nickNoMore=\u00a77Uz nemas zadny nick.
+nickOthersPermission=\u00a7cNemas opravneni menit ostatnim nick.
+nickSet=\u00a77Nyni mas nickname: \u00a7c{0}
+noAccessCommand=\u00a7cNemas povoleni na tento prikaz.
+noAccessPermission=\u00a7cNemas povoleni k tomuto {0}.
+noBreakBedrock=Nemas opravneni nicit bedrock.
+noDestroyPermission=\u00a7cNemas povoleni nicit ten {0}.
+noDurability=\u00a7cThis item does not have a durability.
+noGodWorldWarning=\u00a7cVarovani! God-mode je v tomto svete zakazan.
+noHelpFound=\u00a7cZadne shodujici prikazy.
+noHomeSet=Nemas nastaveny zadny domov.
+noHomeSetPlayer=Hrac nema nastaveny zadny domov.
+noKitPermission=\u00a7cPotrebujes \u00a7c{0}\u00a7c permission, aby jsi mohl pouzit tento kit.
+noKits=\u00a77Nejsou zadne dostupne kity.
+noMail=Nemas zadny mail.
+noMotd=\u00a7cNeni zadna zprava dne.
+noNewMail=\u00a77Nemas zadny novy mail.
+noPendingRequest=Nemas zadne neuzavrene zadosti.
+noPerm=\u00a7cNemas \u00a7f{0}\u00a7c permici.
+noPermToSpawnMob=\u00a7cNemas povoleni k spawnovani mobu.
+noPlacePermission=\u00a7cNemas povoleni pokladat nebo nicit cokoliv blizko teto cedule.
+noPowerTools=Nemas zadny mocny nastroj.
+noRules=\u00a7cNejsou nastaveny zadne pravidla.
+noWarpsDefined=Nejsou nastaveny zadne warpy.
+none=zadny
+notAllowedToQuestion=\u00a7cNejsi opravnen pouzit otazku.
+notAllowedToShout=\u00a7cNejsi opravnen pouzit kriceni.
+notEnoughExperience=Nemas dostatek zkusenosti.
+notEnoughMoney=Nemas dostatecny financni obnos.
+notFlying=not flying
+notRecommendedBukkit=* ! * Verze bukkitu neni doporucena pro Essentials.
+notSupportedYet=Jeste neni podporovano.
+nothingInHand = \u00a7cNedrzis nic v ruce.
+now=nyni
+nuke=Prsi na tebe smrt :)
+numberRequired=Hlupaku, musis vyplnit cislo.
+onlyDayNight=/time podporuje pouze day/night.
+onlyPlayers=Pouze hraci ve hre mohou pouzit: {0}.
+onlySunStorm=/weather podporuje pouze sun/storm.
+orderBalances=Usporadavam bohatstvi {0} hracu, prosim vydrz ...
+pTimeCurrent=\u00a7eCas hrace u00a7f je {1}. //???
+pTimeCurrentFixed=\u00a7eCas hrace {0} u00a7f je nastaven na {1}.
+pTimeNormal=\u00a7eCas hrace {0}\u00a7f je normalni a souhlasi s casem serveru.
+pTimeOthersPermission=\u00a7cNejsi opravnen menit cizim hracum cas.
+pTimePlayers=Tihle hraci maji nastaveny svuj cas:
+pTimeReset=Cas hrace byl obnoven za: \u00a7e{0}
+pTimeSet=Cas hrace je nastaven na \u00a73{0}\u00a7f za: \u00a7e{1}
+pTimeSetFixed=Cas hrace je fixne nastaven na \u00a73{0}\u00a7f za: \u00a7e{1}
+parseError=Chyba pri parsovani {0} na radku {1}
+pendingTeleportCancelled=\u00a7cNevyresena zadost o teleportaci byla zrusena.
+permissionsError=Chybi Permissions/GroupManager; prefixy/suffixy v chatu budou zablokovany.
+playerBanned=\u00a7cAdmin {0} zabanoval {1} za {2}
+playerInJail=\u00a7cHrac je jiz uveznen {0}.
+playerJailed=\u00a77Hrac {0} byl uveznen.
+playerJailedFor= \u00a77Hrac {0} uveznen za {1}.
+playerKicked=\u00a7cAdmin {0} vyhodil {1} za {2}
+playerMuted=\u00a77Byl jsi umlcen.
+playerMutedFor=\u00a77Byl jsi umlcen za {0}
+playerNeverOnServer=\u00a7cHrac {0} nebyl nikdy na serveru.
+playerNotFound=\u00a7cHrac nenalezen.
+playerUnmuted=\u00a77Byl jsi odmlcen.
+pong=Pong!
+possibleWorlds=\u00a77Mozne svety jsou cisla 0 az {0}.
+powerToolAir=Prikaz nemuze byt spojen se vzduchem.
+powerToolAlreadySet=Prikaz \u00a7c{0}\u00a7f je jiz spojen s {1}.
+powerToolAttach=\u00a7c{0}\u00a7f prikaz pripsan k {1}.
+powerToolClearAll=Vsechny mocne nastroje byli smazany.
+powerToolList=Hrac {1} ma tyto prikazy: \u00a7c{0}\u00a7f.
+powerToolListEmpty={0} nema pripsany zadne prikazy.
+powerToolNoSuchCommandAssigned=Prikaz \u00a7c{0}\u00a7f nebyl pripsan k {1}.
+powerToolRemove=Prikaz \u00a7c{0}\u00a7f odstranen z {1}.
+powerToolRemoveAll=Vsechny prikazy zruseny od {0}.
+powerToolsDisabled=Vsechny tve mocne nastroje byli zablokovany.
+powerToolsEnabled=Vsechny tve mocne nastroje byli povoleny.
+protectionOwner=\u00a76[EssentialsProtect] Majitel ochrany: {0}
+questionFormat=\u00a77[Otazka]\u00a7f {0}
+readNextPage=Napis /{0} {1} pro precteni dalsi stranky.
+reloadAllPlugins=\u00a77Znovu nacteny vsechny pluginy.
+removed=\u00a77Odstraneno {0} entitit.
+repair=Uspesne jsi opravil svuj nastroj: \u00a7e{0}.
+repairAlreadyFixed=\u00a77Tento item nepotrebuje opravu.
+repairEnchanted=\u00a77Nemas opravneni opravovat enchantovane itemy.
+repairInvalidType=\u00a7cTento item nemuze byt opraven.
+repairNone=Nemas zadne itemy, ktere potrebuji opravit.
+requestAccepted=\u00a77Zadost o teleport prijata.
+requestAcceptedFrom=\u00a77{0} prijal tvou zadost o teleport.
+requestDenied=\u00a77Zadost o teleport zamitnuta.
+requestDeniedFrom=\u00a77{0} odmitl tvou zadost o teleport.
+requestSent=\u00a77Zadost odeslana hraci {0}\u00a77.
+requestTimedOut=\u00a7cZadost o teleportaci vyprsela.
+requiredBukkit= * ! * Potrebujete minimalne verzi {0} Bukkitu, stahnete si ji z http://dl.bukkit.org/downloads/craftbukkit/
+returnPlayerToJailError=Nastala chyba pri pokusu navraceni hrace {0} do vezeni: {1}
+second=sekunda
+seconds=sekundy
+seenOffline=Hrac {0} je offline od {1}
+seenOnline=Hrac {0} je online od {1}
+serverFull=Server je plny
+serverTotal=Maximum serveru: {0}
+setSpawner=Zmenil jsi spawner na: {0}
+sheepMalformedColor=Deformovana barva.
+shoutFormat=\u00a77[Shout]\u00a7f {0}
+signFormatFail=\u00a74[{0}]
+signFormatSuccess=\u00a71[{0}]
+signFormatTemplate=[{0}]
+signProtectInvalidLocation=\u00a74Nemas opravneni vytvaret zde cedule.
+similarWarpExist=Warp s podobnym nebo stejnym jmenem jiz existuje.
+slimeMalformedSize=Zdeformovana velikost.
+soloMob=Tento mob ma rad, kdyz je sam.
+spawnSet=\u00a77Spawn-lokace nastavena pro skupinu: {0}.
+spawned=spawnut
+sudoExempt=Nemuzes ovladat tohoto hrace
+sudoRun=Nutis hrace {0} k behu: /{1} {2}
+suicideMessage=\u00a77Sbohem kruty svete...
+suicideSuccess= \u00a77{0} si vzal svuj zivot
+survival=survival
+takenFromAccount=\u00a7c{0} bylo odecteno z tveho uctu.
+takenFromOthersAccount=\u00a7c{0} bylo odebrano z {1}\u00a7c uctu. Nova hodnota: {2}
+teleportAAll=\u00a77Zadost o teleportaci odeslana vsem hracum...
+teleportAll=\u00a77Teleportuji v\u00c5\u00a1echny hrace...
+teleportAtoB=\u00a77{0}\u00a77 vas teleportoval k {1}\u00a77.
+teleportDisabled={0} mas teleportaci zablokovanou.
+teleportHereRequest=\u00a7c{0}\u00a7c vas pozadal aby jste se warpnul k nemu.
+teleportNewPlayerError=Teleportace noveho hrace selhala
+teleportRequest=\u00a7c{0}\u00a7c se chce teleportovat k tobe.
+teleportRequestTimeoutInfo=\u00a77Tato zadost vyprsi za {0} sekund.
+teleportTop=\u00a77Teleportuji na vrch.
+teleportationCommencing=\u00a77Teleportace zahajena...
+teleportationDisabled=\u00a77Teleportace zakazana.
+teleportationEnabled=\u00a77Teleportace povolena.
+teleporting=\u00a77Teleportuji...
+teleportingPortal=\u00a77Teleportuji pres portal.
+tempBanned=Docasne zabanovany na dobu {0}
+tempbanExempt=\u00a77Nemel by jsi docasne zabanovat tohoto hrace.
+thunder= Nastavil jsi {0} bouri ve tvem svete.
+thunderDuration=Nastavil jsi {0} bouri ve svete po {1} sekund.
+timeBeforeHeal=Potrebny cas pro dalsi uzdraveni: {0}
+timeBeforeTeleport=Potrebny cas pro dalsi teleport: {0}
+timeFormat=\u00a73{0}\u00a7f nebo \u00a73{1}\u00a7f nebo \u00a73{2}\u00a7f
+timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
+timeSet=Cas nastaven ve vsech svetech.
+timeSetPermission=\u00a7cNejsi autorizovany ke zmene casu.
+timeWorldCurrent=Ve svete {0} je prave \u00a73{1}
+timeWorldSet=Cas byl nastaven na {0} ve: \u00a7c{1}
+tps=Current TPS = {0}
+tradeCompleted=\u00a77Vymena kompletni.
+tradeSignEmpty=Tato cedule jiz nema dostupny material na vymenu.
+tradeSignEmptyOwner=Na teto ceduli dosel material.
+treeFailure=\u00a7cNepodarilo se vytvorit strom. Zkus to znovu na trave nebo hline.
+treeSpawned=\u00a77Strom vytvoren.
+true=\u00a72true\u00a7f
+typeTpaccept=\u00a77Pro prijmuti zadosti napis \u00a7c/tpaccept\u00a77.
+typeTpdeny=\u00a77Pokud chces odmitnout zadost napis \u00a7c/tpdeny\u00a77.
+typeWorldName=\u00a77Muzes take napsat specificky nazev sveta.
+unableToSpawnMob=Nemozne spawnout moba.
+unbannedIP=Unbanovana IP adresa.
+unbannedPlayer=Hrac odbanovan.
+unignorePlayer=Prestal jsi ignorovat hrace {0}.
+unknownItemId=Nezname ID itemu: {0}
+unknownItemInList=Neznamy item {0} v {1} seznamu.
+unknownItemName=Neznamy nazev itemu: {0}
+unlimitedItemPermission=\u00a7cNemas opravneni pro neomezeny item: {0}.
+unlimitedItems=Neomezene itemy:
+unmutedPlayer=Hrac {0} byl umlcen.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
+upgradingFilesError=Chyba pri updatovani souboru.
+userDoesNotExist=Uzivatel {0} neexistuje.
+userIsAway={0} je AFK.
+userIsNotAway={0} se vratil.
+userJailed=\u00a77Byl jsi uveznen.
+userUsedPortal={0} pouzil portal pro vychod.
+userdataMoveBackError=Chyba pri pokusu o presun userdata/{0}.tmp do userdata/{1}
+userdataMoveError=Chyba pri pokusu o presun userdata/{0} do userdata/{1}.tmp
+usingTempFolderForTesting=Pouzivam docasnou slozku pro testovani:
+vanished=\u00a7aYou have now been vanished.
+versionMismatch=Chyba verzi! Prosim updatuj {0} na stejnou verzi.
+versionMismatchAll=Chyba verzi! Prosim, updatuj vsechny Essentials .jar na stejnou verzi.
+voiceSilenced=\u00a77Byl jsi ztisen.
+warpDeleteError=Vyskytl se problem pri mazani warpu.
+warpListPermission=\u00a7cNemas opravneni listovat warpami.
+warpNotExist=Tento warp neexistuje.
+warpOverwrite=\u00a7cNemuzes prepsat tento warp.
+warpSet=\u00a77Warp {0} vytvoren.
+warpUsePermission=\u00a7cNemas opravneni pouzit tento warp.
+warpingTo=\u00a77Warpuji te do {0}.
+warps=Warpy: {0}
+warpsCount=\u00a77Mame zde {0} warpu. Strana {1} z {2}.
+weatherStorm=\u00a77Nastavil jsi bourku v {0}
+weatherStormFor=\u00a77Nastavil jsi bourku v {0} na {1} sekund.
+weatherSun=\u00a77Nastavil jsi slunecne pocasi v {0}
+weatherSunFor=\u00a77Nastavil jsi slunecne pocasi v {0} na {1} sekund
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Zabanovan:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Uroven {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Herni mod:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Puvod:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Zdravi:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP Adresa:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Pozice:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Penize:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+worth=\u00a77Stack {0} ceny \u00a7c{1}\u00a77 ({2} kus(u) za {3} kus)
+worthMeta=\u00a77Stack {0} s metadaty {1} ceny \u00a7c{2}\u00a77 ({3} kus(u) za {4} kus)
+worthSet=Hodnota ceny nastavena
+year=rok
+years=roky
+youAreHealed=\u00a77Byl jsi uzdraven.
+youHaveNewMail=\u00a7cMas {0} zprav!\u00a7f Napis \u00a77/mail read\u00a7f aby jsi si precetl sve zpravy.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index e06985430..731679961 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -35,6 +35,7 @@ cantFindGeoIpDB=Kan ikke finde GeoIP database!
cantReadGeoIpDB=Fejl ved afl\u00e6sning af GeoIP database!
cantSpawnItem=\u00a7cDu har ikke tilladelse til at skabe tingen.{0}
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
commandFailed=Kommandoen {0} fejlede:
commandHelpFailedForPlugin=Fejl ved hentning af hj\u00e6lp til: {0}
@@ -42,7 +43,7 @@ commandNotLoaded=\u00a7cKommando {0} er ikke indl\u00e6st korrekt.
compassBearing=\u00a77B\u00e6rer: {0} ({1} grader). (Oversat korrekt?)
configFileMoveError=Kunne ikke flytte config.yml til backup placering.
configFileRenameError=Kunne ikke omd\u00f8be temp fil til config.yml
-connectedPlayers=Tilsluttede spillere:
+connectedPlayers=Tilsluttede spillere:
connectionFailed=Kunne ikke \u00e5bne forbindelse.
cooldownWithMessage=\u00a7cCooldown: {0}
corruptNodeInConfig=\u00a74Notits: Din konfigurationsfil har en korrupt {0} linje.
@@ -51,6 +52,7 @@ creatingConfigFromTemplate=Opretter config fra skabelon: {0}
creatingEmptyConfig=Opretter tom config: {0}
creative=creative
currency={0}{1}
+currentWorld=Current World: {0}
day=dag
days=dage
defaultBanReason=Banhammeren har talt!
@@ -72,6 +74,7 @@ disabledToSpawnMob=Skabelse af denne mob er deaktiveret i configfilen.
dontMoveMessage=\u00a77Teleportering vil begynde om {0}. Bev\u00e6g dig ikke.
downloadingGeoIp=Downloader GeoIP database... det her kan tage et stykke tid (land: 0.6 MB, by: 27MB)
duplicatedUserdata=Duplikerede userdata: {0} og {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
enableUnlimited=\u00a77Giver ubegr\u00e6nset m\u00e6ngde af {0} til {1}.
enabled=aktiveret
enchantmentApplied = \u00a77Enchantment {0} er blevet tilf\u00c3\u00b8jet til tingen i din h\u00c3\u00a5nd.
@@ -84,16 +87,19 @@ errorWithMessage=\u00a7cFejl: {0}
essentialsHelp1=Denne fil er \u00c3\u00b8delagt og Essentials kan ikke \u00c3\u00a5bne den. Essentials er nu deaktiveret. Kan du ikke ordne denne fil selv, kan du f\u00c3\u00a5 hj\u00c3\u00a6lp p\u00c3\u00a5 http://tiny.cc/EssentialsChat
essentialsHelp2=Filen er \u00c3\u00b8delagt og Essentials kan ikke \u00c3\u00a5bne den. Essentials er nu deaktiveret. Kan du ikke ordne denne fil selv, skriv enten /essentialshelp ingame eller f\u00c3\u00a5 hj\u00c3\u00a6lp p\u00c3\u00a5 http://tiny.cc/EssentialsChat
essentialsReload=\u00a77Essentials Genindl\u00e6st {0}.
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
extinguish=\u00a77Du slukkede ilden i dig selv.
extinguishOthers=\u00a77Du slukkede ilden i {0}.
failedToCloseConfig=Fejlede i at lukke config {0}
failedToCreateConfig=Fejlede i oprettelse af config {0}
failedToWriteConfig=Fejlede i at skrive til config {0}
-false=false
+false=\u00a74false\u00a7f
feed=\u00a77Your appetite was sated.
feedOther=\u00a77Satisfied {0}.
fileRenameError=Omd\u00c3\u00b8bning af fil {0} fejlede.
flyMode=\u00a77Set fly mode {0} for {1}.
+flying=flying
foreverAlone=\u00a7cDu har ingen til hvem du kan svare.
freedMemory=Frigjorde {0} MB.
gameMode=\u00a77Satte game mode {0} for {1}.
@@ -108,6 +114,10 @@ geoipJoinFormat=Spilleren {0} kommer fra {1}
godDisabledFor=deaktiveret for {0}
godEnabledFor=aktiveret for {0}
godMode=\u00a77Gud mode {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
haveBeenReleased=\u00a77Du er blevet l\u00f8sladt
heal=\u00a77Du er blevet healed.
healOther=\u00a77Healed {0}.
@@ -164,6 +174,7 @@ jailSet=\u00a77F\u00e6ngsel {0} er blevet sat.
jumpError=Dette vil skade din computer''s hjerne.
kickDefault=Kicked fra serveren.
kickExempt=\u00a77Du kan ikke kicke denne spiller.
+kickedAll=\u00a7cKicked all players from server
kill=\u00a77dr\u00e6bte {0}.
kitError2=\u00a7cDette kit eksisterer ikke eller er forkert defineret.
kitError=\u00a7cDer er ikke nogen gyldige kits.
@@ -222,6 +233,7 @@ noAccessCommand=\u00a7cDu har ikke adgang til denne kommando.
noAccessPermission=\u00a7cDu har ikke tilladelse til at f\u00e5 adgang til {0}.
noBreakBedrock=You are not allowed to destroy bedrock.
noDestroyPermission=\u00a7cDu har ikke tilladelse til at \u00f8del\u00e6gge {0}.
+noDurability=\u00a7cThis item does not have a durability.
noGodWorldWarning=\u00a7cAdvarsel! God mode er sl\u00c3\u00a5et fra i denne verden.
noHelpFound=\u00a7cIngen matchende kommandoer.
noHomeSet=Du har sat et nyt hjem.
@@ -243,6 +255,7 @@ notAllowedToQuestion=\u00a7cDu har ikke tilladelse til at bruge sp\u00f8rgsm\u00
notAllowedToShout=\u00a7cDu har ikke tilladelse til at r\u00e5be.
notEnoughExperience=You do not have enough experience.
notEnoughMoney=Du har ikke tilstr\u00e6kkeligt med penge.
+notFlying=not flying
notRecommendedBukkit=* ! * Bukkit version er ikke den anbefalede build til Essentials.
notSupportedYet=Ikke underst\u00f8ttet endnu.
nothingInHand = \u00a7cDu har intet i din h\u00c3\u00a5nd.
@@ -356,12 +369,13 @@ timeSet=Tid \u00c3\u00a6ndret i alle verdener.
timeSetPermission=\u00a7cDu har ikke tilladelse til at \u00c3\u00a6ndre tiden.
timeWorldCurrent=Tiden p\u00c3\u00a5 nuv\u00c3\u00a6rende tidspunkt i {0} er \u00a73{1}
timeWorldSet=Tiden blev \u00c3\u00a6ndret til {0} i: \u00a7c{1}
+tps=Current TPS = {0}
tradeCompleted=\u00a77Handel gennemf\u00f8rt.
tradeSignEmpty=Handelsskiltet har udsolgt!
tradeSignEmptyOwner=Der er intet at hente ved dette handelsskilt.
treeFailure=\u00a7cTr\u00e6 genereringsfejl. Pr\u00f8v igen p\u00e5 gr\u00e6s eller jord.
treeSpawned=\u00a77Tr\u00e6 spawned.
-true=true
+true=\u00a72true\u00a7f
typeTpaccept=\u00a77For at teleportere, skriv \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77For at n\u00e6gte denne anmodning om teleport, skriv \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77Du kan ogs\u00e5 skrive navnet p\u00e5 en specifik verden.
@@ -375,6 +389,8 @@ unknownItemName=Ukendt ting navn: {0}
unlimitedItemPermission=\u00a7cIngen tilladelse til ubegr\u00e6nset ting {0}.
unlimitedItems=Ubegr\u00c3\u00a6nsede ting:
unmutedPlayer=Spilleren {0} unmuted.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
upgradingFilesError=Fejl under opgradering af filerne.
userDoesNotExist=Brugeren {0} eksisterer ikke.
userIsAway={0} er nu AFK. Skub ham i havet eller bur ham inde!
@@ -384,6 +400,7 @@ userUsedPortal={0} brugte en eksisterende udgangsportal.
userdataMoveBackError=Kunne ikke flytte userdata/{0}.tmp til userdata/{1}
userdataMoveError=Kunne ikke flytte userdata/{0} til userdata/{1}.tmp
usingTempFolderForTesting=Bruger temp-mappe til testing:
+vanished=\u00a7aYou have now been vanished.
versionMismatch=Versioner matcher ikke! Opdater venligst {0} til den nyeste version.
versionMismatchAll=Versioner matcher ikke! Opdater venligst alle Essentials jar-filer til samme version.
voiceSilenced=\u00a77Din stemme er blevet gjort stille.
@@ -400,20 +417,22 @@ weatherStorm=\u00a77Du har sat vejret til ''storm'' i {0}
weatherStormFor=\u00a77Du har sat vejret til ''storm'' i {0} i {1} sekunder
weatherSun=\u00a77Du har sat vejret til ''sol'' i {0}
weatherSunFor=\u00a77Du har sat vejret til ''sol'' i {0} i {1} sekunder
-whoisBanned=\u00a79 - Banned: {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Gamemode: {0}
-whoisGeoLocation=\u00a79 - Placering: {0}
-whoisGod=\u00a79 - God mode: {0}
-whoisHealth=\u00a79 - Health: {0}/20
-whoisIPAddress=\u00a79 - IP-Adresse: {0}
-whoisIs={0} er {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Placering: ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Saldo: {0}
-whoisOP=\u00a79 - OP: {0}
-whoisStatusAvailable=\u00a79 - Status: Tilg\u00e6ngelig
-whoisStatusAway=\u00a79 - Status: \u00a7cAFK\u00a7f
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banned:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Gamemode:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Placering:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Health:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP-Adresse:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Placering:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Saldo:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
worth=\u00a77Stack af {0} er v\u00e6rd \u00a7c{1}\u00a77 ({2} ting for {3} pr. stk.)
worthMeta=\u00a77Stack af {0} med metadata af {1} er v\u00e6rd \u00a7c{2}\u00a77 ({3} ting for {4} pr. stk.)
worthSet=V\u00e6rdi \u00c3\u00a6ndret.
@@ -421,3 +440,5 @@ year=\u00e5r
years=\u00e5r
youAreHealed=\u00a77Du er blevet healed. Halleluja!
youHaveNewMail=\u00a7cDu har {0} flaskeposter!\u00a7f Type \u00a77/mail read for at se din flaskepost.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 4e4f7e78d..b6e84fb66 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -35,6 +35,7 @@ cantFindGeoIpDB=Kann GeoIP-Datenbank nicht finden!
cantReadGeoIpDB=Fehler beim Einlesen der GeoIP-Datenbank!
cantSpawnItem=\u00a7cDu darfst {0} nicht erzeugen.
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
commandFailed=Befehl {0} scheiterte:
commandHelpFailedForPlugin=Fehler beim Abrufen der Hilfe f\u00fcr: {0}
@@ -42,7 +43,7 @@ commandNotLoaded=\u00a7cBefehl {0} ist nicht richtig geladen.
compassBearing=\u00a77Peilung: {0} ({1} Grad).
configFileMoveError=Verschieben von config.yml in den Sicherheitskopien-Ordner gescheitert.
configFileRenameError=Verschieben einer tempor\u00e4ren Datei nach config.yml gescheitert.
-connectedPlayers=Verbundene Spieler:
+connectedPlayers=Verbundene Spieler:
connectionFailed=Fehler beim Verbindungsaufbau.
cooldownWithMessage=\u00a7cBeschr\u00e4nkung: {0}
corruptNodeInConfig=\u00a74Hinweis: Deine Konfigurationsdatei hat einen ung\u00fcltigen Knoten {0}.
@@ -51,6 +52,7 @@ creatingConfigFromTemplate=Erstelle Konfiguration aus Vorlage: {0}
creatingEmptyConfig=Erstelle leere Konfiguration: {0}
creative=creative
currency={0}{1}
+currentWorld=Current World: {0}
day=Tag
days=Tage
defaultBanReason=Der Bann-Hammer hat gesprochen!
@@ -72,6 +74,7 @@ disabledToSpawnMob=Spawning this mob was disabled in the config file.
dontMoveMessage=\u00a77Teleportvorgang startet in {0}. Beweg dich nicht.
downloadingGeoIp=Lade GeoIP-Datenbank ... dies kann etwas dauern (country: 0.6 MB, city: 20MB)
duplicatedUserdata=Doppelte Datei in userdata: {0} und {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
enableUnlimited=\u00a77Gebe {1} unendliche Mengen von {0}.
enabled=aktiviert
enchantmentApplied = \u00a77The enchantment {0} has been applied to your item in hand.
@@ -84,16 +87,19 @@ errorWithMessage=\u00a7cFehler: {0}
essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
essentialsReload=\u00a77Essentials neu geladen {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
extinguish=\u00a77Du hast dich selbst gel\u00f6scht.
extinguishOthers=\u00a77Du hast {0} gel\u00f6scht.
failedToCloseConfig=Fehler beim Schliessen der Konfiguration {0}
failedToCreateConfig=Fehler beim Erstellen der Konfiguration {0}
failedToWriteConfig=Fehler beim Schreiben der Konfiguration {0}
-false=false
+false=\u00a74false\u00a7f
feed=\u00a77Your appetite was sated.
feedOther=\u00a77Satisfied {0}.
fileRenameError=Umbenennen von {0} gescheitert.
flyMode=\u00a77Set fly mode {0} for {1}.
+flying=flying
foreverAlone=\u00a7cDu hast niemanden, dem du antworten kannst.
freedMemory={0} MB frei gemacht.
gameMode=\u00a77Set game mode {0} for {1}.
@@ -108,6 +114,10 @@ geoipJoinFormat=Spieler {0} kommt aus {1}
godDisabledFor=deaktiviert f\u00fcr {0}
godEnabledFor=aktiviert f\u00fcr {0}
godMode=\u00a77Unsterblichkeit {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cSie tragen keinen Hut.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
haveBeenReleased=\u00a77Du wurdest frei gelassen.
heal=\u00a77Du wurdest geheilt.
healOther=\u00a77{0} geheilt.
@@ -164,6 +174,7 @@ jailSet=\u00a77Gef\u00e4ngnis {0} wurde erstellt.
jumpError=Das w\u00fcrde deinen Computer \u00fcberlasten.
kickDefault=Vom Server geworfen
kickExempt=\u00a7cDu kannst diesen Spieler nicht rauswerfen.
+kickedAll=\u00a7cKicked all players from server
kill=\u00a77{0} get\u00f6tet.
kitError2=\u00a7cDiese Ausr\u00fcstung existiert nicht oder ist ung\u00fcltig.
kitError=\u00a7cEs gibt keine g\u00fcltigen Ausr\u00fcstungen.
@@ -222,6 +233,7 @@ noAccessCommand=\u00a7cDu hast keinen Zugriff auf diesen Befehl.
noAccessPermission=\u00a7cDu hast keine Rechte, den Block {0} zu \u00f6ffnen.
noBreakBedrock=You are not allowed to destroy bedrock.
noDestroyPermission=\u00a7cDu hast keine Rechte, den Block {0} zu zerst\u00f6ren.
+noDurability=\u00a7cThis item does not have a durability.
noGodWorldWarning=\u00a7cWarning! God mode in this world disabled.
noHelpFound=\u00a7cKeine \u00fcbereinstimmenden Kommandos.
noHomeSet=Du hast kein Zuhause gesetzt.
@@ -243,6 +255,7 @@ notAllowedToQuestion=\u00a7cDu bist nicht berechtigt zu fragen.
notAllowedToShout=\u00a7cDu bist nicht berechtigt zu schreien.
notEnoughExperience=You do not have enough experience.
notEnoughMoney=Du hast nicht genug Geld.
+notFlying=not flying
notRecommendedBukkit=* ! * Die verwendete Bukkit-Version ist nicht f\u00fcr Essentials empfohlen.
notSupportedYet=Noch nicht verf\u00fcgbar.
nothingInHand = \u00a7cYou have nothing in your hand.
@@ -356,12 +369,13 @@ timeSet=Zeit in allen Welten gesetzt.
timeSetPermission=\u00a7cDu hast keine Berechtigung die Zeit zu \u00e4ndern.
timeWorldCurrent=Die momentane Zeit in {0} ist \u00a73{1}
timeWorldSet=Die Zeit in \u00a7c{1}\u00a7f wurde zu {0} gesetzt.
+tps=Current TPS = {0}
tradeCompleted=\u00a77Handel abgeschlossen.
tradeSignEmpty=Der Bestand des Trade-Schild ist aufgebraucht.
tradeSignEmptyOwner=Es gibt nichts mehr zu Sammeln von diesem Trade-Schild.
treeFailure=\u00a7cBaumpflanzung gescheitert. Versuche es auf Gras oder Dreck.
treeSpawned=\u00a77Baum gepflanzt.
-true=true
+true=\u00a72true\u00a7f
typeTpaccept=\u00a77Um zu teleportieren, schreibe \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77Um diese Anfrage abzulehnen, schreibe \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77Du kannst auch den Namen der Welt eingeben.
@@ -375,6 +389,8 @@ unknownItemName=Unbekannter Gegenstand: {0}
unlimitedItemPermission=\u00a7cDu hast keine Rechte f\u00fcr {0}.
unlimitedItems=Unendliche Objekte:
unmutedPlayer=Spieler {0} ist nicht mehr stumm.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
upgradingFilesError=Fehler beim Aktualisieren der Dateien
userDoesNotExist=Spieler {0} existiert nicht.
userIsAway={0} ist abwesend.
@@ -384,6 +400,7 @@ userUsedPortal={0} benutzt ein vorhandenes Ausgangsportal.
userdataMoveBackError=Verschieben von userdata/{0}.tmp nach userdata/{1} gescheitert.
userdataMoveError=Verschieben von userdata/{0} nach userdata/{1}.tmp gescheitert.
usingTempFolderForTesting=Benutze tempor\u00e4ren Ordner zum Testen:
+vanished=\u00a7aYou have now been vanished.
versionMismatch=Versionen nicht identisch! Bitte aktualisiere {0}.
versionMismatchAll=Versionen ungleich! Bitte aktualisiere alle Essentials jars auf die gleiche Version.
voiceSilenced=\u00a77Du bist stumm
@@ -400,24 +417,28 @@ weatherStorm=\u00a77In {0} st\u00fcrmt es nun.
weatherStormFor=\u00a77In {0} st\u00fcrmt es nun f\u00fcr {1} Sekunden.
weatherSun=\u00a77In {0} scheint nun die Sonne.
weatherSunFor=\u00a77In {0} scheint nun f\u00fcr {1} Sekunden die Sonne.
-whoisBanned=\u00a79 - Banned: {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Gamemode: {0}
-whoisGeoLocation=\u00a79 - Herkunft: {0}
-whoisGod=\u00a79 - God mode: {0}
-whoisHealth=\u00a79 - Gesundheit: {0}/20
-whoisIPAddress=\u00a79 - IP-Adresse: {0}
-whoisIs={0} ist {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Position: ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Geldb\u00f6rse: {0}
-whoisOP=\u00a79 - OP: {0}
-whoisStatusAvailable=\u00a79 - Status: Anwesend
-whoisStatusAway=\u00a79 - Status: \u00a7cAbwesend\u00a7f
-worth=\u00a77Ein Stapel von {0} ist \u00a7c{1}\u00a77 wert ({2} Einheiten je {3})
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banned:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Gamemode:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Herkunft:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Gesundheit:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP-Adresse:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Position:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Geldb\u00f6rse:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+worth=\u00a77Stack of {0} worth \u00a7c{1}\u00a77 ({2} item(s) at {3} each)
worthMeta=\u00a77Ein Stapel von {0} mit Metadaten {1} ist \u00a7c{2}\u00a77 wert. ({3} Einheiten je {4})
worthSet=Wert des Gegenstands gesetzt.
year=Jahr
years=Jahre
youAreHealed=\u00a77Du wurdest geheilt.
youHaveNewMail=\u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 34367f115..6f0d47990 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -31,10 +31,11 @@ buildAlert=\u00a7cYou are not permitted to build
bukkitFormatChanged=Bukkit version format changed. Version not checked.
burnMsg=\u00a77You set {0} on fire for {1} seconds.
canTalkAgain=\u00a77You can talk again
-cantFindGeoIpDB=Can''t find GeoIP database!
+cantFindGeoIpDB=Can't find GeoIP database!
cantReadGeoIpDB=Failed to read GeoIP database!
cantSpawnItem=\u00a7cYou are not allowed to spawn the item {0}
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
commandFailed=Command {0} failed:
commandHelpFailedForPlugin=Error getting help for: {0}
@@ -42,7 +43,7 @@ commandNotLoaded=\u00a7cCommand {0} is improperly loaded.
compassBearing=\u00a77Bearing: {0} ({1} degrees).
configFileMoveError=Failed to move config.yml to backup location.
configFileRenameError=Failed to rename temp file to config.yml
-connectedPlayers=Connected players:
+connectedPlayers=Connected players:
connectionFailed=Failed to open connection.
cooldownWithMessage=\u00a7cCooldown: {0}
corruptNodeInConfig=\u00a74Notice: Your configuration file has a corrupt {0} node.
@@ -51,6 +52,7 @@ creatingConfigFromTemplate=Creating config from template: {0}
creatingEmptyConfig=Creating empty config: {0}
creative=creative
currency={0}{1}
+currentWorld=Current World: {0}
day=day
days=days
defaultBanReason=The Ban Hammer has spoken!
@@ -72,6 +74,7 @@ disabledToSpawnMob=Spawning this mob was disabled in the config file.
dontMoveMessage=\u00a77Teleportation will commence in {0}. Don''t move.
downloadingGeoIp=Downloading GeoIP database ... this might take a while (country: 0.6 MB, city: 20MB)
duplicatedUserdata=Duplicated userdata: {0} and {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
enableUnlimited=\u00a77Giving unlimited amount of {0} to {1}.
enabled=enabled
enchantmentApplied = \u00a77The enchantment {0} has been applied to your item in hand.
@@ -84,16 +87,19 @@ errorWithMessage=\u00a7cError: {0}
essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
essentialsReload=\u00a77Essentials Reloaded {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
extinguish=\u00a77You extinguished yourself.
extinguishOthers=\u00a77You extinguished {0}.
failedToCloseConfig=Failed to close config {0}
failedToCreateConfig=Failed to create config {0}
failedToWriteConfig=Failed to write config {0}
-false=false
+false=\u00a74false\u00a7f
feed=\u00a77Your appetite was sated.
feedOther=\u00a77Satisfied {0}.
fileRenameError=Renaming file {0} failed
flyMode=\u00a77Set fly mode {0} for {1}.
+flying=flying
foreverAlone=\u00a7cYou have nobody to whom you can reply.
freedMemory=Freed {0} MB.
gameMode=\u00a77Set game mode {0} for {1}.
@@ -108,6 +114,10 @@ geoipJoinFormat=Player {0} comes from {1}
godDisabledFor=disabled for {0}
godEnabledFor=enabled for {0}
godMode=\u00a77God mode {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
haveBeenReleased=\u00a77You have been released
heal=\u00a77You have been healed.
healOther=\u00a77Healed {0}.
@@ -136,7 +146,7 @@ invRestored=Your inventory has been restored.
invSee=You see the inventory of {0}.
invSeeHelp=Use /invsee to restore your inventory.
invalidCharge=\u00a7cInvalid charge.
-invalidHome=Home {0} doesn't exist
+invalidHome=Home {0} doesn''t exist
invalidMob=Invalid mob type.
invalidServer=Invalid server!
invalidSignLine=Line {0} on sign is invalid.
@@ -161,9 +171,10 @@ jailReleased=\u00a77Player \u00a7e{0}\u00a77 unjailed.
jailReleasedPlayerNotify=\u00a77You have been released!
jailSentenceExtended=Jail time extend to: {0)
jailSet=\u00a77Jail {0} has been set
-jumpError=That would hurt your computer''s brain.
+jumpError=That would hurt your computer's brain.
kickDefault=Kicked from server
kickExempt=\u00a7cYou can not kick that person.
+kickedAll=\u00a7cKicked all players from server
kill=\u00a77Killed {0}.
kitError2=\u00a7cThat kit does not exist or is improperly defined.
kitError=\u00a7cThere are no valid kits.
@@ -222,6 +233,7 @@ noAccessCommand=\u00a7cYou do not have access to that command.
noAccessPermission=\u00a7cYou do not have permission to access that {0}.
noBreakBedrock=You are not allowed to destroy bedrock.
noDestroyPermission=\u00a7cYou do not have permission to destroy that {0}.
+noDurability=\u00a7cThis item does not have a durability.
noGodWorldWarning=\u00a7cWarning! God mode in this world disabled.
noHelpFound=\u00a7cNo matching commands.
noHomeSet=You have not set a home.
@@ -233,7 +245,7 @@ noMotd=\u00a7cThere is no message of the day.
noNewMail=\u00a77You have no new mail.
noPendingRequest=You do not have a pending request.
noPerm=\u00a7cYou do not have the \u00a7f{0}\u00a7c permission.
-noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
+noPermToSpawnMob=\u00a7cYou don't have permission to spawn this mob.
noPlacePermission=\u00a7cYou do not have permission to place a block near that sign.
noPowerTools=You have no power tools assigned.
noRules=\u00a7cThere are no rules specified yet.
@@ -243,7 +255,8 @@ notAllowedToQuestion=\u00a7cYou are not authorized to use question.
notAllowedToShout=\u00a7cYou are not authorized to shout.
notEnoughExperience=You do not have enough experience.
notEnoughMoney=You do not have sufficient funds.
-notRecommendedBukkit=* ! * Bukkit version is not the recommended build for Essentials.
+notFlying=not flying
+notRecommendedBukkit= * ! * Bukkit version is not the recommended build for Essentials.
notSupportedYet=Not supported yet.
nothingInHand = \u00a7cYou have nothing in your hand.
now=now
@@ -256,7 +269,7 @@ orderBalances=Ordering balances of {0} users, please wait ...
pTimeCurrent=\u00a7e{0}''s\u00a7f time is {1}.
pTimeCurrentFixed=\u00a7e{0}''s\u00a7f time is fixed to {1}.
pTimeNormal=\u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission=\u00a7cYou are not authorized to set other players'' time.
+pTimeOthersPermission=\u00a7cYou are not authorized to set other players' time.
pTimePlayers=These players have their own time:
pTimeReset=Player time has been reset for: \u00a7e{0}
pTimeSet=Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
@@ -276,7 +289,7 @@ playerNotFound=\u00a7cPlayer not found.
playerUnmuted=\u00a77You have been unmuted
pong=Pong!
possibleWorlds=\u00a77Possible worlds are the numbers 0 through {0}.
-powerToolAir=Command can''t be attached to air.
+powerToolAir=Command can't be attached to air.
powerToolAlreadySet=Command \u00a7c{0}\u00a7f is already assigned to {1}.
powerToolAttach=\u00a7c{0}\u00a7f command assigned to {1}.
powerToolClearAll=All powertool commands have been cleared.
@@ -285,7 +298,7 @@ powerToolListEmpty={0} has no commands assigned.
powerToolNoSuchCommandAssigned=Command \u00a7c{0}\u00a7f has not been assigned to {1}.
powerToolRemove=Command \u00a7c{0}\u00a7f removed from {1}.
powerToolRemoveAll=All commands removed from {0}.
-powerToolsDisabled=All of your power tools have been enabled.
+powerToolsDisabled=All of your power tools have been disabled.
powerToolsEnabled=All of your power tools have been enabled.
protectionOwner=\u00a76[EssentialsProtect] Protection owner: {0}
questionFormat=\u00a77[Question]\u00a7f {0}
@@ -300,7 +313,7 @@ repairNone=There were no items that needing repairing.
requestAccepted=\u00a77Teleport request accepted.
requestAcceptedFrom=\u00a77{0} accepted your teleport request.
requestDenied=\u00a77Teleport request denied.
-requestDeniedFrom=\u00a77{0} denied your teleport request
+requestDeniedFrom=\u00a77{0} denied your teleport request.
requestSent=\u00a77Request sent to {0}\u00a77.
requestTimedOut=\u00a7cTeleport request has timed out
requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://dl.bukkit.org/downloads/craftbukkit/
@@ -356,12 +369,13 @@ timeSet=Time set in all worlds.
timeSetPermission=\u00a7cYou are not authorized to set the time.
timeWorldCurrent=The current time in {0} is \u00a73{1}
timeWorldSet=The time was set to {0} in: \u00a7c{1}
+tps=Current TPS = {0}
tradeCompleted=\u00a77Trade completed.
-tradeSignEmpty=The trade sign does not have enough supply left.
+tradeSignEmpty=The trade sign has nothing available for you.
tradeSignEmptyOwner=There is nothing to collect from this trade sign.
treeFailure=\u00a7cTree generation failure. Try again on grass or dirt.
treeSpawned=\u00a77Tree spawned.
-true=true
+true=\u00a72true\u00a7f
typeTpaccept=\u00a77To teleport, type \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77To deny this request, type \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77You can also type the name of a specific world.
@@ -375,6 +389,8 @@ unknownItemName=Unknown item name: {0}
unlimitedItemPermission=\u00a7cNo permission for unlimited item {0}.
unlimitedItems=Unlimited items:
unmutedPlayer=Player {0} unmuted.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
upgradingFilesError=Error while upgrading the files
userDoesNotExist=The user {0} does not exist.
userIsAway={0} is now AFK
@@ -384,11 +400,12 @@ userUsedPortal={0} used an existing exit portal.
userdataMoveBackError=Failed to move userdata/{0}.tmp to userdata/{1}
userdataMoveError=Failed to move userdata/{0} to userdata/{1}.tmp
usingTempFolderForTesting=Using temp folder for testing:
+vanished=\u00a7aYou have now been vanished.
versionMismatch=Version mismatch! Please update {0} to the same version.
versionMismatchAll=Version mismatch! Please update all Essentials jars to the same version.
voiceSilenced=\u00a77Your voice has been silenced
warpDeleteError=Problem deleting the warp file.
-warpListPermission=\u00a7cYou do not have Permission to list that warps.
+warpListPermission=\u00a7cYou do not have Permission to list warps.
warpNotExist=That warp does not exist.
warpOverwrite=\u00a7cYou cannot overwrite that warp.
warpSet=\u00a77Warp {0} set.
@@ -400,20 +417,22 @@ weatherStorm=\u00a77You set the weather to storm in {0}
weatherStormFor=\u00a77You set the weather to storm in {0} for {1} seconds
weatherSun=\u00a77You set the weather to sun in {0}
weatherSunFor=\u00a77You set the weather to sun in {0} for {1} seconds
-whoisBanned=\u00a79 - Banned: {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Gamemode: {0}
-whoisGeoLocation=\u00a79 - Location: {0}
-whoisGod=\u00a79 - God mode: {0}
-whoisHealth=\u00a79 - Health: {0}/20
-whoisIPAddress=\u00a79 - IP Address: {0}
-whoisIs={0} is {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Location: ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Money: {0}
-whoisOP=\u00a79 - OP: {0}
-whoisStatusAvailable=\u00a79 - Status: Available
-whoisStatusAway=\u00a79 - Status: \u00a7cAway\u00a7f
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banned:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Gamemode:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Location:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Health:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP Address:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Location:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Money:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
worth=\u00a77Stack of {0} worth \u00a7c{1}\u00a77 ({2} item(s) at {3} each)
worthMeta=\u00a77Stack of {0} with metadata of {1} worth \u00a7c{2}\u00a77 ({3} item(s) at {4} each)
worthSet=Worth value set
@@ -421,3 +440,5 @@ year=year
years=years
youAreHealed=\u00a77You have been healed.
youHaveNewMail=\u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index ad1aefe6c..0e3bbd9bb 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -35,6 +35,7 @@ cantFindGeoIpDB=No se puede encontrar la bases de datos del Geo IP
cantReadGeoIpDB=Error al intentar leer la base de datos del Geo IP
cantSpawnItem=\u00a7cNo tienes acceso para producir este objeto {0}
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
commandFailed=Command {0} fallado:
commandHelpFailedForPlugin=Error obteniendo ayuda para: {0}
@@ -42,7 +43,7 @@ commandNotLoaded=\u00a7cCommand {0} esta cargado incorrectamente.
compassBearing=\u00a77Bearing: {0} ({1} grados).
configFileMoveError=Error al mover config.yml para hacer una copia de seguridad de la localizacion.
configFileRenameError=Error al renombrar archivo temp a config.yml
-connectedPlayers=Jugadores conectados:
+connectedPlayers=Jugadores conectados:
connectionFailed=Error al abrir conexion.
cooldownWithMessage=\u00a7cCooldown: {0}
corruptNodeInConfig=\u00a74Notice: Tu archivo de configuracion tiene un nodo {0} incorrecto.
@@ -51,6 +52,7 @@ creatingConfigFromTemplate=Creando configuracion desde el template: {0}
creatingEmptyConfig=Creando configuracion vacia: {0}
creative=creative
currency={0}{1}
+currentWorld=Current World: {0}
day=dia
days=dias
defaultBanReason=Baneado por incumplir las normas!
@@ -72,6 +74,7 @@ disabledToSpawnMob=Spawning this mob was disabled in the config file.
dontMoveMessage=\u00a77Teletransporte comenzara en {0}. No te muevas.
downloadingGeoIp=Descargando base de datos de GeoIP ... puede llevar un tiempo (pais: 0.6 MB, ciudad: 20MB)
duplicatedUserdata=Datos de usuario duplicados: {0} y {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
enableUnlimited=\u00a77Dando cantidad ilimitada de {0} a {1}.
enabled=activado
enchantmentApplied = \u00a77The enchantment {0} has been applied to your item in hand.
@@ -84,16 +87,19 @@ errorWithMessage=\u00a7cError: {0}
essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
essentialsReload=\u00a77Essentials Recargado {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
extinguish=\u00a77Te has suicidado.
extinguishOthers=\u00a77Has matado a {0}.
failedToCloseConfig=Error al cerrar configuracion {0}
failedToCreateConfig=Error al crear configuracion {0}
failedToWriteConfig=Error al escribir configuracion {0}
-false=false
+false=\u00a74false\u00a7f
feed=\u00a77Your appetite was sated.
feedOther=\u00a77Satisfied {0}.
fileRenameError=Error al renombrar el archivo {0}
flyMode=\u00a77Set fly mode {0} for {1}.
+flying=flying
foreverAlone=\u00a7cNo tienes nadie a quien puedas responder.
freedMemory= {0} MB libres.
gameMode=\u00a77Set game mode {0} for {1}.
@@ -108,6 +114,10 @@ geoipJoinFormat=El jugador {0} viene de {1}
godDisabledFor=Desactivado para {0}
godEnabledFor=Activado para {0}
godMode=\u00a77Modo Dios {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
haveBeenReleased=\u00a77Has sido liberado
heal=\u00a77Has sido curado.
healOther=\u00a77Has curado a {0}.
@@ -164,6 +174,7 @@ jailSet=\u00a77Carcel {0} ha sido puesta
jumpError=Eso es demasiado para tu ordenador!
kickDefault=Echado del servidor.
kickExempt=\u00a7cNo puedes echar a esa persona.
+kickedAll=\u00a7cKicked all players from server
kill=\u00a77ha matado a {0}.
kitError2=\u00a7cEse kit no existe o esta mal escrito.
kitError=\u00a7cNo hay ningun kit valido.
@@ -222,6 +233,7 @@ noAccessCommand=\u00a7cNo tienes acceso a ese comando.
noAccessPermission=\u00a7cNo tienes permisos para hacer eso {0}.
noBreakBedrock=You are not allowed to destroy bedrock.
noDestroyPermission=\u00a7cNo tienes permisos para destrozar eso {0}.
+noDurability=\u00a7cThis item does not have a durability.
noGodWorldWarning=\u00a7cWarning! God mode in this world disabled.
noHelpFound=\u00a7cNo hay comandos relacionados.
noHomeSet=No has establecido un hogar.
@@ -243,6 +255,7 @@ notAllowedToQuestion=\u00a7cYou estas autorizado para usar las preguntas.
notAllowedToShout=\u00a7cNo estas autorizado para gritar.
notEnoughExperience=You do not have enough experience.
notEnoughMoney=No tienes el dinero suficiente.
+notFlying=not flying
notRecommendedBukkit=* ! * La version de bukkit no es la recomendada para esta version de Essentials.
notSupportedYet=No esta soportado aun.
nothingInHand = \u00a7cYou have nothing in your hand.
@@ -356,12 +369,13 @@ timeSet=Time establecido en todos los mundos.
timeSetPermission=\u00a7cNo estas autorizado para establecer la hora.
timeWorldCurrent=La hora actual en {0} es \u00a73{1}
timeWorldSet=La hora ha sido establecido a {0} en: \u00a7c{1}
+tps=Current TPS = {0}
tradeCompleted=\u00a77Intercambio completado.
tradeSignEmpty=Esta tienda no tiene nada disponible para ti.
tradeSignEmptyOwner=No hay nada que recojer de esta tienda.
treeFailure=\u00a7cError al generar arbol. Prueba de nuevo en tierra o hierba.
treeSpawned=\u00a77Arbol puesto.
-true=true
+true=\u00a72true\u00a7f
typeTpaccept=\u00a77Para teletransportarte, escribe \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77Para denegar esta peticion, escribe \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77Tu tambien puedes escribir el nombre de un mundo especifico.
@@ -375,6 +389,8 @@ unknownItemName=Nombre de objeto desconocido: {0}
unlimitedItemPermission=\u00a7cNo tienes permiso para objetos ilimitados {0}.
unlimitedItems=Objetos ilimitados.
unmutedPlayer=Jugador {0} desmuteado.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
upgradingFilesError=Error mientras se actualizaban los archivos
userDoesNotExist=El usuario {0} no existe
userIsAway={0} esta ahora ausente!
@@ -384,6 +400,7 @@ userUsedPortal={0} uso un portal de salida existente.
userdataMoveBackError=Error al mover userdata/{0}.tmp a userdata/{1}
userdataMoveError=Error al mover userdata/{0} a userdata/{1}.tmp
usingTempFolderForTesting=Usando carpeta temporal para pruebas:
+vanished=\u00a7aYou have now been vanished.
versionMismatch=La version no coincide! Por favor actualiza {0} a la misma version.
versionMismatchAll=La version no coincide! Por favor actualiza todos los jars de Essentials a la misma version.
voiceSilenced=\u00a77Tu voz ha sido silenciada
@@ -400,20 +417,22 @@ weatherStorm=\u00a77Has establecido el tiempo a tormenta en este mundo.
weatherStormFor=\u00a77Has establecido el tiempo a tormenta en este {1} durante {0} segundos.
weatherSun=\u00a77Has establecido el tiempo a sol en este mundo.
weatherSunFor=\u00a77Has establecido el tiempo a sol en este {1} durante {0} segundos.
-whoisBanned=\u00a79 - Banned: {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Gamemode: {0}
-whoisGeoLocation=\u00a79 - Localizacion: {0}
-whoisGod=\u00a79 - God mode: {0}
-whoisHealth=\u00a79 - Salud: {0}/20
-whoisIPAddress=\u00a79 - Direccion IP: {0}
-whoisIs={0} es {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Localizacion: ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Dinero: {0}
-whoisOP=\u00a79 - OP: {0}
-whoisStatusAvailable=\u00a79 - Estado: Disponible
-whoisStatusAway=\u00a79 - Status: \u00a7cAusente\u00a7f
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banned:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Gamemode:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Localizacion:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Salud:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - Direccion IP:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Localizacion:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Dinero:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
worth=\u00a77Pila de {0} con valor de \u00a7c{1}\u00a77 ({2} objeto(s) a {3} cada uno)
worthMeta=\u00a77Pila de {0} con metadata de {1} , con valor de \u00a7c{2}\u00a77 ({3} objeto(s) a {4} cada uno)
worthSet=Establecer el valor de un valor
@@ -421,3 +440,5 @@ year=a&ntilde;o
years=a&ntilde;os
youAreHealed=\u00a77Has sido curado.
youHaveNewMail=\u00a7cTienes {0} mensajes!\u00a7f Pon \u00a77/mail read\u00a7f para ver tus emails no leidos!.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
new file mode 100644
index 000000000..dcf3a5e77
--- /dev/null
+++ b/Essentials/src/messages_fi.properties
@@ -0,0 +1,438 @@
+# version: TeamCity
+# Single quotes have to be doubled: ''
+# Translations start here
+# by:
+action=* {0} {1}
+addedToAccount=\u00a7a{0} on lis\u00e4tty sinun tilillesi.
+addedToOthersAccount=\u00a7a{0} lis\u00e4tty {1}\u00a7a tilille. Uusi rahatilanne: {2}
+alertBroke=rikkoi:
+alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} sijainnissa: {3}
+alertPlaced=laittoi:
+alertUsed=k\u00e4ytti:
+autoAfkKickReason=Sinut on potkittu, koska olit tekem\u00e4tt\u00e4 mit\u00e4\u00e4n {0} minuuttia.
+backAfterDeath=\u00a77K\u00e4yt\u00e4 /back komentoa p\u00e4\u00e4st\u00e4ksesi takaisin sijaintiin, jossa kuolit.
+backUsageMsg=\u00a77Palautetaan \u00e4skeiseen sijaintiin.
+backupDisabled=Ulkoista varmuuskopio koodia ei ole konfiguroitu.
+backupFinished=Varmuuskopiointi suoritettu
+backupStarted=Varmuuskopiointi aloitettu
+balance=\u00a77Rahatilanne: {0}
+balanceTop=\u00a77Top rahatilanteet ({0})
+banExempt=\u00a7cEt voi bannia pelaajaa.
+banIpAddress=\u00a77Bannattu IP osoite
+bannedIpsFileError=Virhe luettaessa banned-ips.txt tiedostoa
+bannedIpsFileNotFound=banned-ips.txt tiedostoa ei l\u00f6ydy
+bannedPlayersFileError=Virhe luettaessa banned-players.txt tiedostoa
+bannedPlayersFileNotFound=banned-players.txt ei l\u00f6ydy
+bigTreeFailure=\u00a7cIson puun luominen ep\u00e4onnistui. Yrit\u00e4 uudelleen nurmikolla tai mullalla.
+bigTreeSuccess= \u00a77Iso puu luotu.
+blockList=Essentials siirsi seuraavat komennot muihin plugineihin:
+broadcast=[\u00a7cIlmoitus\u00a7f]\u00a7a {0}
+buildAlert=\u00a7cSinulla ei ole oikeuksia rakentaa
+bukkitFormatChanged=Bukkitin versiomuoto muuttui. Versiota ei ole tarkistettu.
+burnMsg=\u00a77Asetit pelaajan {0} tuleen {1} sekunniksi.
+canTalkAgain=\u00a77Voit taas puhua
+cantFindGeoIpDB=Ei l\u00f6ydetty GeoIP tietokantaa!
+cantReadGeoIpDB=Ei pystytty lukemaan GeoIP tietokantaa!
+cantSpawnItem=\u00a7cSinulla ei ole oikeutta luoda tavaraa {0}
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
+commandFailed=Komento {0} ep\u00e4onnistui:
+commandHelpFailedForPlugin=Virhe haettaessa apua komennoista: {0}
+commandNotLoaded=\u00a7cKomento {0} on v\u00e4\u00e4rin ladattu.
+compassBearing=\u00a77Osoittaa: {0} ({1} astetta).
+configFileMoveError=Virhe siirrett\u00e4ess\u00e4 tiedostoa config.yml varmuuskopio sijaintiin.
+configFileRenameError=Virhe nimett\u00e4ess\u00e4 tiedostoa temp tiedostoon config.yml
+connectedPlayers=Liittyneet pelaajat:
+connectionFailed=Virhe avattaessa yhteytt\u00e4.
+cooldownWithMessage=\u00a7cJ\u00e4\u00e4htyminen: {0}
+corruptNodeInConfig=\u00a74Huom: Sinun konfigurointi tiedostossa on virhe {0}.
+couldNotFindTemplate=Ei l\u00f6ydetty mallia {0}
+creatingConfigFromTemplate=Luodaan config tiedostoa mallista: {0}
+creatingEmptyConfig=Luodaan tyhj\u00e4\u00e4 config tiedostoa: {0}
+creative=luova
+currency={0}{1}
+currentWorld=T\u00e4m\u00e4nhetkinen maailma: {0}
+day=p\u00e4iv\u00e4
+days=p\u00e4iv\u00e4\u00e4
+defaultBanReason=Ban Nuija on puhunut!
+deleteFileError=Ei voida poistaa tiedostoa: {0}
+deleteHome=\u00a77Koti {0} on poistettu.
+deleteJail=\u00a77Vankila {0} on poistettu.
+deleteWarp=\u00a77Warp {0} on poistettu.
+deniedAccessCommand={0} p\u00e4\u00e4sy komentoon ev\u00e4ttiin.
+dependancyDownloaded=[Essentials] Tarvittu tiedosto {0} ladattu onnistuneesti.
+dependancyException=[Essentials] Virhe ladattaessa tarvittua tiedostoa
+dependancyNotFound=[Essentials] Tarvittua tiedostoa ei l\u00f6ydy, ladataan nyt.
+depth=\u00a77Olet merenpinnan tasolla.
+depthAboveSea=\u00a77Olet {0} palikkaa meritason yl\u00e4puolella.
+depthBelowSea=\u00a77Olet {0} palikkaa meritason alapuolella.
+destinationNotSet=Sijaintia ei ole m\u00e4\u00e4ritetty
+disableUnlimited=\u00a77Poistettu k\u00e4yt\u00f6st\u00e4 loputon laittaminen tavaralta "{0}", pelaajalta {1}.
+disabled=poissa k\u00e4yt\u00f6st\u00e4
+disabledToSpawnMob=T\u00e4m\u00e4n mobin luominen on poistettu k\u00e4yt\u00f6st\u00e4 config tiedostossa.
+dontMoveMessage=\u00a77Teleportataan {0} kuluttua. \u00c4l\u00e4 liiku.
+downloadingGeoIp=Ladataan GeoIP tietokantaa ... t\u00e4m\u00e4 voi vied\u00e4 hetken (maa: 0.6 MB, kaupunki: 20MB)
+duplicatedUserdata=Kopioitu k\u00e4ytt\u00e4j\u00e4n tiedot: {0} ja {1}
+durability=\u00a77T\u00e4ll\u00e4 ty\u00f6kalulla on \u00a7c{0}\u00a77 k\u00e4ytt\u00f6kertaa j\u00e4ljell\u00e4
+enableUnlimited=\u00a77Annetaan loputon m\u00e4\u00e4r\u00e4 tavaraa "{0}" pelaajalle {1}.
+enabled=k\u00e4yt\u00f6ss\u00e4
+enchantmentApplied = \u00a77Parannus "{0}" on lis\u00e4tty tavaraan k\u00e4dess\u00e4si.
+enchantmentNotFound = \u00a7cParannusta ei l\u00f6ydetty
+enchantmentPerm = \u00a7cSinulla ei ole oikeutta {0}
+enchantmentRemoved = \u00a77Parannus {0} on poistettu tavarasta k\u00e4dess\u00e4si.
+enchantments = \u00a77Parannukset: {0}
+errorCallingCommand=Virhe kutsuttaessa komentoa /{0}
+errorWithMessage=\u00a7cVirhe: {0}
+essentialsHelp1=Tiedosto on viallinen ja Essentials ei voi avata sit\u00e4. Essentials on nyt poistettu k\u00e4yt\u00f6st\u00e4. Jos et voi korjata tiedostoa itse, mene osoitteeseen http://tiny.cc/EssentialsChat
+essentialsHelp2=Tiedosto on viallinen ja Essentials ei voi avata sit\u00e4. Essentials on nyt poistettu k\u00e4yt\u00f6st\u00e4. Jos et voi korjata tiedostoa itse, kirjoita /essentialshelp peliss\u00e4 tai mene osoitteeseen http://tiny.cc/EssentialsChat
+essentialsReload=\u00a77Essentials ladattu uudelleen. Versio: {0}
+exp=Pelaajalla \u00a7c{0} \u00a77on\u00a7c {1} \u00a77expi\u00e4 (taso\u00a7c {2}\u00a77) ja tarvitsee\u00a7c {3} \u00a77lis\u00e4\u00e4 expi\u00e4 seuravaan tasoon.
+expSet=Pelaajalla\u00a7c{0} \u00a77on nyt\u00a7c {1} \u00a77expi\u00e4.
+extinguish=\u00a77Sammutit itsesi.
+extinguishOthers=\u00a77Sammutit pelaajan {0}.
+failedToCloseConfig=Virhe suljettaessa tiedostoa config {0}
+failedToCreateConfig=Virhe luotaessa tiedostoa config {0}
+failedToWriteConfig=Virhe muokattaessa tiedostoa config {0}
+false=v\u00e4\u00e4r\u00e4
+feed=\u00a77Ruokahalusi on tyydytetty.
+feedOther=\u00a77Tyydytit ruokahalun pelaajalta {0}.
+fileRenameError={0} uudelleen nime\u00e4minen ep\u00e4onnistui
+flyMode=\u00a77Lento {0} pelaajalla {1}.
+foreverAlone=\u00a7cSinulla ei ole ket\u00e4\u00e4n kenelle vastata.
+freedMemory=Vapaata muistia {0} MB.
+gameMode=\u00a77Asetit pelimuodon "{0}" pelaajalle {1}.
+gcchunks= chunkkia,
+gcentities= kokonaisuutta
+gcfree=Vapaa muisti: {0} MB
+gcmax=Maksimi muisti: {0} MB
+gctotal=Sallittu muisti: {0} MB
+geoIpUrlEmpty=GeoIP latausosoite on tyhj\u00e4.
+geoIpUrlInvalid=GeoIP latausosoite on viallinen.
+geoipJoinFormat=Pelaaja {0} tulee maasta {1}
+godDisabledFor=poistettu pelaajalta {0}
+godEnabledFor=laitettu pelaajalle {0}
+godMode=\u00a77God muoto {0}.
+hatArmor=\u00a7cVirhe, et voi k\u00e4ytt\u00e4\u00e4 t\u00e4t\u00e4 tavaraa hattuna!
+hatFail=\u00a7cSinulla tulee olla jotain k\u00e4dess\u00e4si, mit\u00e4 k\u00e4ytt\u00e4\u00e4 hattuna.
+hatPlaced=\u00a7eNauti uudesta hatustasi!
+haveBeenReleased=\u00a77Sinut on vapautettu
+heal=\u00a77Sinut on parannettu.
+healOther=\u00a77Paransit pelaajan {0}.
+helpConsole=Katsoaksesi apua konsolista, kirjoita ?.
+helpFrom=\u00a77Komennot {0}:
+helpLine=\u00a76/{0}\u00a7f: {1}
+helpMatching=\u00a77Komennot "{0}":
+helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
+helpPages=Sivu \u00a7c{0}\u00a7f / \u00a7c{1}\u00a7f:
+helpPlugin=\u00a74{0}\u00a7f: Plugin apu: /help {1}
+holeInFloor=Reik\u00e4 lattiassa
+homeSet=\u00a77Koti asetettu.
+homeSetToBed=\u00a77Sinun koti on nyt asetettu t\u00e4h\u00e4n s\u00e4nkyyn.
+homes=Kodit: {0}
+hour=tunti
+hours=tunnit
+ignorePlayer=J\u00e4tit huomiotta pelaajan {0}.
+illegalDate=Laiton p\u00e4iv\u00e4m\u00e4\u00e4r\u00e4n muoto.
+infoChapter=Valitse luku:
+infoChapterPages=Luku {0}, sivu \u00a7c{1}\u00a7f / \u00a7c{2}\u00a7f:
+infoFileDoesNotExist=Tiedostoa info.txt ei ole olemassa. Luodaan.
+infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Sivu \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
+infoUnknownChapter=Tuntematon luku.
+invBigger=Toisen pelaajan reppu on isompi kuin sinun.
+invRestored=Sinun reppusi on palautettu.
+invSee=N\u00e4et pelaajan {0} repun.
+invSeeHelp=K\u00e4yt\u00e4 /invsee kun haluat palauttaa oman reppusi.
+invalidCharge=\u00a7cMit\u00e4t\u00f6n m\u00e4\u00e4r\u00e4ys.
+invalidHome=Kotia {0} ei ole olemassa
+invalidMob=Kelvoton mobin tyyppi.
+invalidServer=Kelvoton palvelin!
+invalidSignLine=Kyltin rivi {0} on viallinen.
+invalidWorld=\u00a7cKelvoton maailma.
+inventoryCleared=\u00a77Reppu tyhjennetty.
+inventoryClearedOthers=\u00a77Pelaajan \u00a7c{0}\u00a77 reppu on tyhjennetty.
+is=on
+itemCannotBeSold=Tuota tavaraa ei voi myyd\u00e4 t\u00e4ll\u00e4 palvelimella.
+itemMustBeStacked=Tavara pit\u00e4\u00e4 vaihtaa pakattuina. M\u00e4\u00e4r\u00e4 2s olisi kaksi pakettia, jne.
+itemNotEnough1=\u00a7cSinulla ei ole tarpeeksi tavaraa jota myyd\u00e4.
+itemNotEnough2=\u00a77Jos haluat myyd\u00e4 kaikki tuon tyypin tavarat, k\u00e4yt\u00e4 /sell tavarannimi
+itemNotEnough3=\u00a77/sell itemname -1 myy kaiken paitsi yhden, jne.
+itemSellAir=Yritit myyd\u00e4 ilmaa? Laita tavara k\u00e4teesi ja yrit\u00e4 uudelleen.
+itemSold=\u00a77Myy \u00a7c{0} \u00a77({1} {2} hintaan {3} kpl)
+itemSoldConsole={0} sold {1} for \u00a77{2} \u00a77({3} items at {4} each)
+itemSpawn=\u00a77Annetaan {0} kpl {1}
+itemsCsvNotLoaded=Ei voida ladata tiedostoa items.csv.
+jailAlreadyIncarcerated=\u00a7cPelaaja on jo vankilassa: {0}
+jailMessage=\u00a7cSin\u00e4 teet rikoksen, istut my\u00f6s sen mukaan.
+jailNotExist=Tuota vankilaa ei ole olemassa.
+jailReleased=\u00a77Pelaaja \u00a7e{0}\u00a77 vapautettu.
+jailReleasedPlayerNotify=\u00a77Sinut on vapautettu!
+jailSentenceExtended=Vankila aika pidennetty: {0)
+jailSet=\u00a77Vankila {0} on asetettu
+jumpError=Tuo vahingoittaisi koneesi aivoja.
+kickDefault=Potkittu palvelimelta
+kickExempt=\u00a7cEt voi potkia h\u00e4nt\u00e4.
+kickedAll=\u00a7cPotkittu kaikki pelaajat palvelimelta
+kill=\u00a77Tappoi {0}.
+kitError2=\u00a7cTuota pakkausta ei ole olemassa tai se on v\u00e4\u00e4rin muokattu.
+kitError=\u00a7cEi ole sopivia pakkauksia.
+kitErrorHelp=\u00a7cEhk\u00e4 tavaralle ei ole m\u00e4\u00e4ritetty m\u00e4\u00e4r\u00e4\u00e4 configissa?
+kitGive=\u00a77Annetaan pakkausta "{0}".
+kitInvFull=\u00a7cSinun reppusi on t\u00e4ynn\u00e4, laitetaan tavarat maahan
+kitTimed=\u00a7cAika, jota ennen et voi k\u00e4ytt\u00e4\u00e4 t\u00e4t\u00e4 pakkausta uudelleen: {0}.
+kits=\u00a77Pakkaukset: {0}
+lightningSmited=\u00a77Sinut on salamoitu
+lightningUse=\u00a77Salamoidaan {0}
+listAfkTag = \u00a77[AFK]\u00a7f
+listAmount = \u00a79Pelaajia palvelimella \u00a7c{0}\u00a79 / \u00a7c{1}\u00a79.
+listAmountHidden = \u00a79Pelaajia palvelimella \u00a7c{0}\u00a77/{1}\u00a79 / \u00a7c{2}\u00a79.
+listGroupTag={0}\u00a7f:
+listHiddenTag = \u00a77[HIDDEN]\u00a7f
+loadWarpError=Virhe ladattaessa warppia {0}
+localFormat=Paikallinen: <{0}> {1}
+mailClear=\u00a7cPoistaaksesi viestisi, kirjoita /mail clear
+mailCleared=\u00a77Viestit poistettu!
+mailSent=\u00a77Viesti l\u00e4hetetty!
+markMailAsRead=\u00a7cMerkitse viestit luetuiksi, kirjoita /mail clear
+markedAsAway=\u00a77Sinut on laitettu poissaolevaksi.
+markedAsNotAway=\u00a77Sinua ei ole en\u00e4\u00e4 laitettu poissaolevaksi.
+maxHomes=Voit asettaa maksimissaan {0} kotia.
+mayNotJail=\u00a7cEt voi laittaa tuota pelaajaa vankilaan
+me=min\u00e4
+minute=minuutti
+minutes=minuuttia
+missingItems=Sinulla ei ole {0}kpl {1}.
+missingPrefixSuffix=Puuttuu etuliite tai takaliite {0}
+mobSpawnError=Virhe vaihdettaessa mob-luojan tyyppi\u00e4.
+mobSpawnLimit=Mobien m\u00e4\u00e4r\u00e4 rajoitettu palvelimen maksimim\u00e4\u00e4r\u00e4\u00e4n
+mobSpawnTarget=Kohteen pit\u00e4\u00e4 olla mob-luoja palikka.
+mobsAvailable=\u00a77Mobit: {0}
+moneyRecievedFrom=\u00a7a{0} on vastaanotettu pelaajalta {1}
+moneySentTo=\u00a7a{0} on l\u00e4hetetty pelaajalle {1}
+moneyTaken={0} veloitettiin sinun tililt\u00e4si.
+month=kuukausi
+months=kuukaudet
+moreThanZero=M\u00e4\u00e4r\u00e4n pit\u00e4\u00e4 olla enemm\u00e4n kuin 0.
+msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
+muteExempt=\u00a7cEt voi hiljent\u00e4\u00e4 tuota pelaajaa.
+mutedPlayer=Pelaaja {0} hiljennetty.
+mutedPlayerFor=Pelaaja {0} hiljennetty, koska {1}.
+mutedUserSpeaks={0} yritti puhua, mutta oli hiljennetty.
+nearbyPlayers=Pelaajat l\u00e4hell\u00e4: {0}
+negativeBalanceError=Pelaajalla ei ole mahdollista olla negatiivist\u00e4 m\u00e4\u00e4r\u00e4\u00e4 rahaa.
+nickChanged=Lempinimi vaihdettu.
+nickDisplayName=\u00a77Sinun tulee ottaa k\u00e4ytt\u00f6\u00f6n change-displayname Essentialsin config-tiedostosta.
+nickInUse=\u00a7cSe nimi on jo k\u00e4yt\u00f6ss\u00e4.
+nickNamesAlpha=\u00a7cLempinimen pit\u00e4\u00e4 olla aakkosista.
+nickNoMore=\u00a77Sinulla ei ole en\u00e4\u00e4 lempinime\u00e4.
+nickOthersPermission=\u00a7cSinulla ei ole oikeutta vaihtaa muiden lempinimi\u00e4
+nickSet=\u00a77Lempinimesi on nyt \u00a7c{0}
+noAccessCommand=\u00a7cSinulla ei ole oikeutta tuohon komentoon.
+noAccessPermission=\u00a7cSinulla ei ole oikeutta tuohon {0}.
+noBreakBedrock=Sinulla ei ole lupaa tuhota bedrock-palikoita.
+noDestroyPermission=\u00a7cSinulla ei ole lupaa tuhota sit\u00e4 {0}.
+noDurability=\u00a7cT\u00e4ll\u00e4 tavaralla ei ole kestoa.
+noGodWorldWarning=\u00a7cVaroitus! God muoto ei ole k\u00e4yt\u00f6ss\u00e4 t\u00e4ss\u00e4 maailmassa.
+noHelpFound=\u00a7cEi komentoja.
+noHomeSet=Et ole asettanut kotia.
+noHomeSetPlayer=Pelaaja ei ole asettanut kotia.
+noKitPermission=\u00a7cTarvitset \u00a7c{0}\u00a7c oikeuden, jotta voit k\u00e4ytt\u00e4\u00e4 tuota pakkausta.
+noKits=\u00a77Ei pakkauksia saatavilla viel\u00e4
+noMail=Ei uusia viestej\u00e4
+noMotd=\u00a7cEi ole p\u00e4iv\u00e4n viesti\u00e4.
+noNewMail=\u00a77Ei viestej\u00e4.
+noPendingRequest=Sinulla ei ole odottavia pyynt\u00f6j\u00e4.
+noPerm=\u00a7cSinulla ei ole \u00a7f{0}\u00a7c oikeuksia.
+noPermToSpawnMob=\u00a7cSinulla ei ole lupaa luoda t\u00e4t\u00e4 mobia.
+noPlacePermission=\u00a7cSinulla ei ole lupaa laittaa palikoita l\u00e4helle tuota kyltti\u00e4.
+noPowerTools=Ei voimaty\u00f6kaluja laitettu.
+noRules=\u00a7cEi ole s\u00e4\u00e4nt\u00f6j\u00e4 viel\u00e4.
+noWarpsDefined=Ei warppeja
+none=ei mit\u00e4\u00e4n
+notAllowedToQuestion=\u00a7cSinulla ei ole lupaa k\u00e4ytt\u00e4\u00e4 kysymyst\u00e4.
+notAllowedToShout=\u00a7cSinulla ei ole lupaa huutaa.
+notEnoughExperience=Sinulla ei ole tarpeeksi kokemusta.
+notEnoughMoney=Sinulla ei ole riitt\u00e4v\u00e4sti rahaa.
+notRecommendedBukkit= * ! * Bukkit versio ei ole suositeltu t\u00e4m\u00e4n Essentials version kanssa.
+notSupportedYet=Ei tueta viel\u00e4.
+nothingInHand = \u00a7cSinulla ei ole mit\u00e4\u00e4n k\u00e4dess\u00e4si.
+now=nyt
+nuke=Antaa kuoleman sateen kohdata heid\u00e4t
+numberRequired=Numero menee tuohon, h\u00f6lm\u00f6.
+onlyDayNight=/time tukee vain day/night.
+onlyPlayers=Vain peliss\u00e4 olevat pelaajat voivat k\u00e4ytt\u00e4\u00e4 {0}.
+onlySunStorm=/weather tukee vain sun/storm.
+orderBalances=J\u00e4rjestet\u00e4\u00e4n rahatilanteita {0}, odota...
+pTimeCurrent=Pelaajan \u00a7e{0}\u00a7f aika on {1}.
+pTimeCurrentFixed=Pelaajan \u00a7e{0}\u00a7f aika on korjattu {1}.
+pTimeNormal=Pelaajan \u00a7e{0}\u00a7f aika on normaali ja vastaa palvelimen aikaa.
+pTimeOthersPermission=\u00a7cSinulla ei ole lupaa muokata muiden pelaajien aikaa.
+pTimePlayers=N\u00e4ill\u00e4 pelaajilla on k\u00e4yt\u00f6ss\u00e4 heid\u00e4n oma aika:
+pTimeReset=Pelaajan aika on resetoitu: \u00a7e{0}
+pTimeSet=Pelaajan aika on asetettu \u00a73{0}\u00a7f koska: \u00a7e{1}
+pTimeSetFixed=Pelaajan aika on korjattu \u00a73{0}\u00a7f koska: \u00a7e{1}
+parseError=Virhe tarkistettaessa {0} rivill\u00e4 {1}
+pendingTeleportCancelled=\u00a7cOdottava teleporttipyynt\u00f6 peruttu.
+permissionsError=Puuttuu Permissions/GroupManager; keskustelun etu- ja takaliitteet poistettu k\u00e4yt\u00f6st\u00e4.
+playerBanned=\u00a7cPelaaja {0} bannasi pelaajan {1} syyst\u00e4 {2}
+playerInJail=\u00a7cPelaaja on jo vankilassa {0}.
+playerJailed=\u00a77Pelaaja {0} laitettu vankilaan.
+playerJailedFor= \u00a77Pelaaja {0} laitettu vankilaan, koska {1}.
+playerKicked=\u00a7cPelaaja {0} potki pelaajan {1} koska {2}
+playerMuted=\u00a77Sinut on hiljennetty
+playerMutedFor=\u00a77Sinut on hiljennetty, koska {0}
+playerNeverOnServer=\u00a7cPelaaja {0} ei ole koskaan ollut t\u00e4ll\u00e4 palvelimella.
+playerNotFound=\u00a7cPelaajaa ei l\u00f6ydetty.
+playerUnmuted=\u00a77Sin\u00e4 voit taas puhua
+pong=Pong!
+possibleWorlds=\u00a77Mahdollisia maailmoja on numerot v\u00e4lilt\u00e4 0 - {0}.
+powerToolAir=Komentoa ei voi liitt\u00e4\u00e4 k\u00e4teen.
+powerToolAlreadySet=Komento \u00a7c{0}\u00a7f on liitetty kohteeseen {1}.
+powerToolAttach=\u00a7c{0}\u00a7f komento liitetty kohteeseen {1}.
+powerToolClearAll=Kaikki voimaty\u00f6kalun komennot on poistettu.
+powerToolList={1} omistaa seuraavat komennot: \u00a7c{0}\u00a7f.
+powerToolListEmpty={0} ei ole komentoja liitetty.
+powerToolNoSuchCommandAssigned=Komentoa \u00a7c{0}\u00a7f ei ole liitetty kohteeseen {1}.
+powerToolRemove=Komento \u00a7c{0}\u00a7f poistettu kohteesta {1}.
+powerToolRemoveAll=Kaikki komennot poistettu kohteesta {0}.
+powerToolsDisabled=Kaikki voimaty\u00f6kalut on poistettu k\u00e4yt\u00f6st\u00e4.
+powerToolsEnabled=Kaikki voimaty\u00f6alut on otettu k\u00e4ytt\u00f6\u00f6n.
+protectionOwner=\u00a76[EssentialsProtect] Suojauksen omistaja: {0}
+questionFormat=\u00a77[Question]\u00a7f {0}
+readNextPage=Kirjoita /{0} {1} lukeaksesi seuraavan sivun
+reloadAllPlugins=\u00a77Kaikki pluginit uudelleen ladattu.
+removed=\u00a77Poistettu {0} kokonaisuutta.
+repair=Onnistuneesti korjasit ty\u00f6kalun: \u00a7e{0}.
+repairAlreadyFixed=\u00a77T\u00e4m\u00e4 tavara ei kaipaa korjaamista.
+repairEnchanted=\u00a77Sinulla ei ole lupaa korjata kehitettyj\u00e4 tavaroita.
+repairInvalidType=\u00a7cT\u00e4t\u00e4 tavaraa ei voi korjata.
+repairNone=Ei ollut tavaroita, jotka olivat korjauksen tarpeessa.
+requestAccepted=\u00a77Teleporttaus pyynt\u00f6 hyv\u00e4ksytty.
+requestAcceptedFrom=\u00a77{0} hyv\u00e4ksyi sinun teleportti pyynn\u00f6n.
+requestDenied=\u00a77Teleporttaus pyynt\u00f6 kielletty.
+requestDeniedFrom=\u00a77{0} kielt\u00e4ytyi sinun teleportti pyynn\u00f6st\u00e4.
+requestSent=\u00a77Pyynt\u00f6 l\u00e4hetetty pelaajalle {0}\u00a77.
+requestTimedOut=\u00a7cTeleportti pyynt\u00f6 aikakatkaistiin
+requiredBukkit= * ! * Tarvitset v\u00e4hint\u00e4\u00e4n {0} version CraftBukkitista, lataa se osoitteesta http://dl.bukkit.org/downloads/craftbukkit/
+returnPlayerToJailError=Virhe laitettaessa pelaaja {0} takaisin vankilaan: {1}
+second=sekunti
+seconds=sekuntia
+seenOffline=Pelaaja {0} on ollut offline jo {1}
+seenOnline=Pelaaja {0} on ollut online jo {1}
+serverFull=Palvelin on t\u00e4ynn\u00e4
+serverTotal=Palvelimen kokonaism\u00e4\u00e4r\u00e4m\u00e4\u00e4r\u00e4: {0}
+setSpawner=Vaihdettu mob-luojan tyyppi {0}
+sheepMalformedColor=Viallinen v\u00e4ri.
+shoutFormat=\u00a77[Huuto]\u00a7f {0}
+signFormatFail=\u00a74[{0}]
+signFormatSuccess=\u00a71[{0}]
+signFormatTemplate=[{0}]
+signProtectInvalidLocation=\u00a74Sinulla ei ole lupaa laittaa kyltti\u00e4 t\u00e4h\u00e4n.
+similarWarpExist=Tuon niminen warp on jo olemassa.
+slimeMalformedSize=Viallinen koko.
+soloMob=Tuo mob tykk\u00e4\u00e4 olevan yksin
+spawnSet=\u00a77Spawn sijainti m\u00e4\u00e4ritetty ryhm\u00e4lle {0}.
+spawned=luotu
+sudoExempt=Et voi sudoa t\u00e4t\u00e4 pelaajaa
+sudoRun=Pakotetaan {0} suorittamaan: /{1} {2}
+suicideMessage=\u00a77Hyv\u00e4sti julma maailma...
+suicideSuccess= \u00a77{0} riisti oman henkens\u00e4
+survival=selviytyminen
+takenFromAccount=\u00a7c{0} on veloitettu tililt\u00e4si.
+takenFromOthersAccount=\u00a7c{0} veloitettu pelaajan {1}\u00a7c tililt\u00e4. Uusi rahatilanne: {2}
+teleportAAll=\u00a77Teleporttaus pyynt\u00f6 l\u00e4hetetty kaikille pelaajille...
+teleportAll=\u00a77Teleportataan kaikki pelaajat...
+teleportAtoB=\u00a77{0}\u00a77 teleporttasi sinun luokse {1}\u00a77.
+teleportDisabled=Pelaajalla {0} on teleporttaus poissa k\u00e4yt\u00f6st\u00e4.
+teleportHereRequest=\u00a7c{0}\u00a7c on pyyt\u00e4nyt, ett\u00e4 sin\u00e4 teleporttaat heid\u00e4n luokseen.
+teleportNewPlayerError=Virhe teleportattaessa uutta pelaajaa
+teleportRequest=\u00a7c{0}\u00a7c on pyyt\u00e4nyt lupaa sinun luokse teleporttaamiseen.
+teleportRequestTimeoutInfo=\u00a77T\u00e4m\u00e4 pyynt\u00f6 aikakatkaistaan {0} sekunnin kuluttua.
+teleportTop=\u00a77Teleportataan p\u00e4\u00e4lle.
+teleportationCommencing=\u00a77Teleportataan...
+teleportationDisabled=\u00a77Teleporttaus poistettu k\u00e4yt\u00f6st\u00e4.
+teleportationEnabled=\u00a77Teleportation otettu k\u00e4ytt\u00f6\u00f6n.
+teleporting=\u00a77Teleportataan...
+teleportingPortal=\u00a77Teleportataan portaalin kautta.
+tempBanned=Olet v\u00e4liaikaisesti bannattu palvelimelta, koska {0}
+tempbanExempt=\u00a77Et voi bannia tuota pelaajaa
+thunder= Myrsky {0} maailmassasi
+thunderDuration=Myrsky {0} maailmassasi {1} sekuntia.
+timeBeforeHeal=Aika ennen seuraavaa parannusta: {0}
+timeBeforeTeleport=Aika ennen seuraavaa teleporttausta: {0}
+timeFormat=\u00a73{0}\u00a7f tai \u00a73{1}\u00a7f tai \u00a73{2}\u00a7f
+timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
+timeSet=Aika asetettu kaikissa maailmoissa.
+timeSetPermission=\u00a7cSinulla ei ole lupaa vaihtaa aikaa.
+timeWorldCurrent=T\u00e4m\u00e4nhetkinen aika maailmassa {0} on \u00a73{1}
+timeWorldSet=Aika vaihdettiin {0} maailmassa: \u00a7c{1}
+tps=T\u00e4m\u00e4nhetkinen TPS = {0}
+tradeCompleted=\u00a77Vaihto suoritettu.
+tradeSignEmpty=Vaihtokyltill\u00e4 ei ole mit\u00e4\u00e4n tarjolla sinulle.
+tradeSignEmptyOwner=Ei ole mit\u00e4\u00e4n mit\u00e4 ker\u00e4t\u00e4 t\u00e4st\u00e4 vaihtokyltist\u00e4.
+treeFailure=\u00a7cPuun luominen ep\u00e4onnistui. Yrit\u00e4 uudelleen nurmikolla tai mullalla.
+treeSpawned=\u00a77Puu luotu.
+true=totta
+typeTpaccept=\u00a77Hyv\u00e4ksy\u00e4ksesi, kirjoita \u00a7c/tpaccept\u00a77.
+typeTpdeny=\u00a77Kielt\u00e4\u00e4ksesi, kirjoita \u00a7c/tpdeny\u00a77.
+typeWorldName=\u00a77Voit my\u00f6s laittaa maailman nimen.
+unableToSpawnMob=Ei voida luoda mobia.
+unbannedIP=Unbanned IP osoite.
+unbannedPlayer=Unbanned pelaaja.
+unignorePlayer=Otat taas huomioon pelaajan {0}.
+unknownItemId=Tuntematon tavaran ID: {0}
+unknownItemInList=Tuntematon tavara {0} listassa {1}.
+unknownItemName=Tuntematon tavaran nimi: {0}
+unlimitedItemPermission=\u00a7cEi lupaa loputtomalle tavaralle {0}.
+unlimitedItems=Loputtomat tavarat:
+unmutedPlayer=Pelaajat {0} voi taas puhua.
+unvanished=\u00a7aOlet taas n\u00e4kyvill\u00e4.
+unvanishedReload=\u00a7cSinut on pakotettu taas n\u00e4kyv\u00e4ksi uudelleen latauksen vuoksi.
+upgradingFilesError=Virhe p\u00e4ivitett\u00e4ess\u00e4 tiedostoja
+userDoesNotExist=Pelaajaa {0} ei ole olemassa.
+userIsAway={0} on nyt AFK
+userIsNotAway={0} ei ole en\u00e4\u00e4 AFK
+userJailed=\u00a77Sinut on laitettu vankilaan
+userUsedPortal={0} k\u00e4ytti portaalia.
+userdataMoveBackError=Virhe siirrett\u00e4ess\u00e4 k\u00e4ytt\u00e4j\u00e4n tietoja/{0}.tmp k\u00e4ytt\u00e4j\u00e4n tietoihin/{1}
+userdataMoveError=Virhe siirrett\u00e4ess\u00e4 k\u00e4ytt\u00e4j\u00e4n tietoja/{0} k\u00e4ytt\u00e4j\u00e4n tietoihin/{1}.tmp
+usingTempFolderForTesting=K\u00e4ytet\u00e4\u00e4n v\u00e4liaikaista kansiota testaukseen:
+vanished=\u00a7aOlet n\u00e4kym\u00e4t\u00f6n.
+versionMismatch=Versiot eiv\u00e4t t\u00e4sm\u00e4\u00e4! P\u00e4ivit\u00e4 {0} samaan versioon.
+versionMismatchAll=Versiot eiv\u00e4t t\u00e4sm\u00e4\u00e4! P\u00e4ivit\u00e4 kaikki Essentialsin jar tiedostot samaan versioon.
+voiceSilenced=\u00a77Sinun \u00e4\u00e4ni on hiljennetty
+warpDeleteError=Virhe poistettaessa warp tiedostoa.
+warpListPermission=\u00a7cSinulla ei ole oikeuksia n\u00e4hd\u00e4 warp-listaa.
+warpNotExist=Tuota warppia ei ole olemassa.
+warpOverwrite=\u00a7cEt voi korvata tuota warppia.
+warpSet=\u00a77Warp {0} asetettu.
+warpUsePermission=\u00a7cSinulla ei ole oikeutta k\u00e4ytt\u00e4\u00e4 tuota warppia.
+warpingTo=\u00a77Sinut warpataan pian kohteeseen {0}.
+warps=Warpit: {0}
+warpsCount=\u00a77Warppeja on {0} kpl. N\u00e4ytet\u00e4\u00e4n sivu {1} / {2}.
+weatherStorm=\u00a77Laitoit myrskyn maailmaan {0}
+weatherStormFor=\u00a77Laitoit myrskyn maailmaan {0} {1} sekunniksi
+weatherSun=\u00a77Laitoit auringon paistamaan maailmaan {0}
+weatherSunFor=\u00a77Laitoit auringon paistamaan maailmaan {0} {1} sekunniksi
+whoisBanned=\u00a79 - Bannattu: {0}
+whoisExp=\u00a79 - Exp: {0} (Taso {1})
+whoisGamemode=\u00a79 - Pelimuoto: {0}
+whoisGeoLocation=\u00a79 - Sijainti: {0}
+whoisGod=\u00a79 - God muoto: {0}
+whoisHealth=\u00a79 - Terveys: {0}/20
+whoisIPAddress=\u00a79 - IP Osoite: {0}
+whoisIs={0} on {1}
+whoisJail=\u00a79 - Vankila: {0}
+whoisLocation=\u00a79 - Sijainti: ({0}, {1}, {2}, {3})
+whoisMoney=\u00a79 - Raha: {0}
+whoisOP=\u00a79 - OP: {0}
+whoisStatusAvailable=\u00a79 - Tilanne: Saatavilla
+whoisStatusAway=\u00a79 - Tilanne: \u00a7cPoissa\u00a7f
+worth=\u00a77Pino tavaraa "{0}" on arvoltaan \u00a7c{1}\u00a77 ({2} tavara(a) = {3} kappale)
+worthMeta=\u00a77Pino tavaraa "{0}" metadatan kanssa {1} on arvoltaan \u00a7c{2}\u00a77 ({3} tavara(a) = {4} kappale)
+worthSet=Arvo asetettu
+year=vuosi
+years=vuosia
+youAreHealed=\u00a77Sinut on parannettu.
+youHaveNewMail=\u00a7cSinulla on {0} viesti(\u00e4)!\u00a7f Kirjoita \u00a77/mail read\u00a7f lukeaksesi viestit.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 0c4b94efc..c74f68b3a 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -35,6 +35,7 @@ cantFindGeoIpDB=N'arrive pas \u00e0 trouver la base de donn\u00e9es GeoIP!
cantReadGeoIpDB=Echec de la lecture de la base de donn\u00e9es GeoIP!
cantSpawnItem=\u00a7cVous n''avez pas le droit de faire appara\u00c3\u00aetre {0}
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
commandFailed=\u00c9chec de la commande {0} :
commandHelpFailedForPlugin=Erreur d''obtention d''aide pour : {0}
@@ -42,7 +43,7 @@ commandNotLoaded=\u00a7cLa commande {0} a \u00e9t\u00e9 mal charg\u00e9e.
compassBearing=\u00a77Orientation : {0} ({1} degr\u00e9s).
configFileMoveError=\u00c9chec du d\u00e9placement de config.yml vers l'emplacement de sauvegarde.
configFileRenameError=\u00c9chec du changement de nom du fichier temporaire de config.yml
-connectedPlayers=Joueurs connect\u00e9s :
+connectedPlayers=Joueurs connect\u00e9s :
connectionFailed=\u00c9chec de l'ouverture de la connexion.
cooldownWithMessage=\u00a7cR\u00e9utilisation : {0}
corruptNodeInConfig=\u00a74Annonce : Votre fichier de configuration a un {0} n\u0153ud corrompu.
@@ -51,6 +52,7 @@ creatingConfigFromTemplate=Cr\u00e9ation de la configuration \u00e0 partir du mo
creatingEmptyConfig=Cr\u00e9ation d''une configuration vierge : {0}
creative=cr\u00e9atif
currency={0}{1}
+currentWorld=Current World: {0}
day=jour
days=jours
defaultBanReason=Le marteau du bannissement a frapp\u00e9 !
@@ -72,6 +74,7 @@ disabledToSpawnMob=Spawning this mob was disabled in the config file.
dontMoveMessage=\u00a77La t\u00e9l\u00e9portation commence dans {0}. Ne bougez pas.
downloadingGeoIp=T\u00e9l\u00e9chargement de la base de donn\u00e9es GeoIP ... Cela peut prendre un moment (Pays : 0.6 Mo, villes : 20Mo)
duplicatedUserdata=Donn\u00e9e utilisateur dupliqu\u00e9e : {0} et {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
enableUnlimited=\u00a77Quantit\u00e9 illimit\u00e9e de {0} \u00e0 {1}.
enabled=activ\u00e9
enchantmentApplied = \u00a77L''enchantement {0} a \u00e9t\u00e9 appliqu\u00e9 \u00e0 l''objet dans votre main.
@@ -84,16 +87,19 @@ errorWithMessage=\u00a7cErreur : {0}
essentialsHelp1=Le fichier est corrompuet Essentials ne peut l'ouvrir. Essentials est maintenant d\u00e9sactiv\u00e9. Si vous ne pouvez corriger vous-m\u00eame, aller \u00e0 http://tiny.cc/EssentialsChat
essentialsHelp2=Le fichier est corrompuet Essentials ne peut l'ouvrir. Essentials est maintenant d\u00e9sactiv\u00e9. Si vous ne pouvez corriger vous-m\u00eame, tapez /essentialshelp ou aller \u00e0 http://tiny.cc/EssentialsChat
essentialsReload=\u00a77Essentials {0} a \u00e9t\u00e9 recharg\u00e9.
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
extinguish=\u00a77Vous cessez de br\u00fbler.
extinguishOthers=\u00a77Vous avez \u00e9teint la combustion de {0}.
failedToCloseConfig=Echec de la fermeture de la configuration {0}
failedToCreateConfig=Echec de la cr\u00e9ation de la configuration {0}
failedToWriteConfig=\u00c9chec de l''\u00e9criture de la configuration {0}
-false=non
+false=\u00a74false\u00a7f
feed=\u00a77Vous avez \u00e9t\u00e9 rassasi\u00e9.
feedOther=\u00a77 est rassasi\u00e9 {0}.
fileRenameError=Echec du changement de nom de {0}
flyMode=\u00a77Set fly mode {0} for {1}.
+flying=flying
foreverAlone=\u00a7cVous n''avez personne \u00e0 qui r\u00e9pondre
freedMemory=A lib\u00e9r\u00e9 {0} Mo.
gameMode=\u00a77Mode de jeu {0} pour {1}.
@@ -108,6 +114,10 @@ geoipJoinFormat=Joueur {0} vient de {1}
godDisabledFor=d\u00e9sactiv\u00e9 pour {0}
godEnabledFor=activ\u00e9 pour {0}
godMode=\u00a77Mode Dieu {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
haveBeenReleased=\u00a77Vous avez \u00e9t\u00e9 lib\u00e9r\u00e9.
heal=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
healOther=\u00a77{0} a \u00e9t\u00e9 soign\u00e9.
@@ -164,6 +174,7 @@ jailSet=\u00a77La prison {0} a \u00e9t\u00e9 cr\u00e9\u00e9.
jumpError=\u00c7a aurait pu faire mal au cerveau de votre ordinateur.
kickDefault=\u00c9ject\u00e9 du serveur
kickExempt=\u00a77Vous ne pouvez pas \u00e9jecter ce joueur.
+kickedAll=\u00a7cKicked all players from server
kill=\u00a77Tu\u00e9 {0}.
kitError2=\u00a7cCe kit n'existe pas ou a \u00e9t\u00e9 mal d\u00e9fini.
kitError=\u00a7cIl n'y a pas de kits valides.
@@ -222,6 +233,7 @@ noAccessCommand=\u00a7cVous n'avez pas acc\u00c3\u00a8s \u00e0 cette commande.
noAccessPermission=\u00a7cVous n''avez pas la permissions d''acc\u00e9der \u00e0 cette {0}
noBreakBedrock=You are not allowed to destroy bedrock.
noDestroyPermission=\u00a7cVous n''avez pas la permission de d\u00e9truire ce {0}.
+noDurability=\u00a7cThis item does not have a durability.
noGodWorldWarning=\u00a7cWarning! Le mode Dieu est d\u00e9sactiv\u00e9 dans ce monde.
noHelpFound=\u00a7cAucune commande correspondante.
noHomeSet=Vous n'avez pas d\u00e9fini de r\u00e9sidence.
@@ -243,6 +255,7 @@ notAllowedToQuestion=\u00a7cVous n'\u00eates pas autoris\u00e9 \u00e0 poser des
notAllowedToShout=\u00a7cVous n'\u00eates pas autoris\u00e9 \u00e0 crier.
notEnoughExperience=Vous n'avez pas assez d'exp\u00e9rience.
notEnoughMoney=Vous n'avez pas les fonds n\u00e9cessaires.
+notFlying=not flying
notRecommendedBukkit=* ! * La version de Bukkit n'est pas celle qui est recommand\u00e9 pour cette version de Essentials.
notSupportedYet=Pas encore pris en charge.
nothingInHand = \u00a7cVous n'avez rien en main.
@@ -356,12 +369,13 @@ timeSet=Heure r\u00e9gl\u00e9e dans tous les mondes.
timeSetPermission=\u00a7cVous n'\u00eates pas autoris\u00e9 \u00e0 r\u00e9gler l'heure.
timeWorldCurrent=Il est \u00a73{1}\u00a77 dans \u00a7c{0}.
timeWorldSet=L''heure a \u00e9t\u00e9 r\u00e9gl\u00e9e \u00e0 {0} dans : \u00a7c{1}
+tps=Current TPS = {0}
tradeCompleted=\u00a77\u00c9change termin\u00e9.
tradeSignEmpty=Le panneau de vente n'as pas encore assez de stock.
tradeSignEmptyOwner=Il n'y a rien \u00e0 collecter de cette pancarte d'\u00e9change commercial.
treeFailure=\u00a7cEchec de la g\u00e9n\u00e9ration de l'arbre. Essayez de nouveau sur de l'herbe ou de la terre.
treeSpawned=\u00a77Arbre cr\u00e9\u00e9.
-true=oui
+true=\u00a72true\u00a7f
typeTpaccept=\u00a77Pour le t\u00e9l\u00e9porter, utilisez \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77Pour d\u00e9cliner cette demande, utilisez \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77Vous pouvez aussi taper le nom d'un monde sp\u00e9cifique.
@@ -375,6 +389,8 @@ unknownItemName=Nom d''objet inconnu : {0}
unlimitedItemPermission=\u00a7cPas de permission pour l''objet illimit\u00e9 {0}.
unlimitedItems=Objets illimit\u00e9s:
unmutedPlayer=Le joueur {0} n''est plus muet.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
upgradingFilesError=Erreur durant la mise \u00e0 jour des fichiers.
userDoesNotExist=L''utilisateur {0} n''existe pas.
userIsAway={0} s'est mis en AFK
@@ -384,6 +400,7 @@ userUsedPortal={0} a utilis\u00e9 un portail existant.
userdataMoveBackError=Echec du d\u00e9placement de userdata/{0}.tmp vers userdata/{1}
userdataMoveError=Echec du d\u00e9placement de userdata/{0} vers userdata/{1}.tmp
usingTempFolderForTesting=Utilise un fichier temporaire pour un test.
+vanished=\u00a7aYou have now been vanished.
versionMismatch=Versions diff\u00e9rentes ! Mettez s''il vous plait {0} \u00e0 la m\u00eame version.
versionMismatchAll=Mauvaise version ! S'il vous plait mettez des jars Essentials de version identique.
voiceSilenced=\u00a77Vous avez \u00e9t\u00e9 r\u00e9duit au silence.
@@ -400,20 +417,22 @@ weatherStorm=\u00a77Vous avez programm\u00e9 l''orage dans {0}
weatherStormFor=\u00a77Vous avez programm\u00e9 l''orage dans {0} pour {1} secondes.
weatherSun=\u00a77Vous avez programm\u00e9 le beau temps dans {0}
weatherSunFor=\u00a77Vous avez programm\u00e9 le beau temps dans {0} pour {1} secondes.
-whoisBanned=\u00a79 - Banni : {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Mode de jeu : {0}
-whoisGeoLocation=\u00a79 - Emplacement : {0}
-whoisGod=\u00a79 - Mode Dieu : {0}
-whoisHealth=\u00a79 - Sant\u00e9 : {0} / 20
-whoisIPAddress=\u00a79 - Adresse IP : {0}
-whoisIs={0} est {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Emplacement : ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Argent : {0}
-whoisOP=\u00a79 - OP : {0}
-whoisStatusAvailable=\u00a79 - Statut : Disponible
-whoisStatusAway=\u00a79 - Statut : \u00a7cAilleurs\u00a7f
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banni:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Mode de jeu:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Emplacement:\u00a7f {0}
+whoisGod=\u00a76 - Mode Dieu:\u00a7f {0}
+whoisHealth=\u00a76 - Sant\u00e9:\u00a7f {0} / 20
+whoisIPAddress=\u00a76 - Adresse IP:\u00a7f {0}
+whoisJail=\u00a76 - Jail:\u00a7f {0}
+whoisLocation=\u00a76 - Emplacement:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Argent:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
worth=\u00a77Une pile de {0} vaut \u00a7c{1}\u00a77 ({2} objet(s) \u00e0 {3} chacun)
worthMeta=\u00a77Une pile de {0} avec la m\u00e9tadonn\u00e9e de {1} vaut \u00a7c{2}\u00a77 ({3} objet(s) \u00e0 {4} chacun)
worthSet=Valeur cr\u00e9e
@@ -421,3 +440,5 @@ year=ann\u00e9e
years=ann\u00e9es
youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
youHaveNewMail=\u00a7cVous avez {0} messages ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
new file mode 100644
index 000000000..16c419bf4
--- /dev/null
+++ b/Essentials/src/messages_it.properties
@@ -0,0 +1,444 @@
+#version: TeamCity
+# Single quotes have to be doubled: ''
+# Translations start here
+# by:
+action=* {0} {1}
+addedToAccount=\u00a7a{0} e'' stato aggiunto al tuo account.
+addedToOthersAccount=\u00a7a{0} e'' stato aggiunto all''account {1}\u00a7a. Nuovo bilancio: {2}
+alertBroke=fallito:
+alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} a: {3}
+alertPlaced=collocato:
+alertUsed=usato:
+autoAfkKickReason=Sei stato kickato per inattivita'' oltre i {0} minuti.
+backAfterDeath=\u00a77Digita il comando /back per tornare al punto dove sei morto.
+backUsageMsg=\u00a77Ritorna alla posizione precedente.
+backupDisabled=Un script di backup esterno non e'' stato configurato.
+backupFinished=Backup terminato
+backupStarted=Backup iniziato
+balance=\u00a77Bilancio: {0}
+balanceTop=\u00a77Top bilanci ({0})
+banExempt=\u00a7cNon puoi bannare questo player.
+banIpAddress=\u00a77IP address bannato
+bannedIpsFileError=Errore di lettura banned-ips.txt
+bannedIpsFileNotFound=banned-ips.txt non trovato
+bannedPlayersFileError=Errore di lettura banned-players.txt
+bannedPlayersFileNotFound=banned-players.txt non trovato
+bigTreeFailure=\u00a7cCreazione del grande albero fallita. Riprova sull''erba o sul terreno.
+bigTreeSuccess= \u00a77Grande albero creato.
+blockList=Essentials ha trasmesso i seguenti comandi ad un altro plugin:
+broadcast=[\u00a7cBroadcast\u00a7f]\u00a7a {0}
+buildAlert=\u00a7cNon hai i permessi per costruire
+bukkitFormatChanged=Il formato della versione Bukkit e'' cambiato. Versione non controllata.
+burnMsg=\u00a77Hai impostato{0} infuocato per {1} secondi.
+canTalkAgain=\u00a77Ora puoi parlare di nuovo
+cantFindGeoIpDB=Non trovo il database GeoIP!
+cantReadGeoIpDB=Lettura fallita del database GeoIP!
+cantSpawnItem=\u00a7cNon sei abilitato a generare l''oggetto {0}
+chatTypeLocal=[L]
+chatTypeAdmin=[A]
+chatTypeSpy=[Spy]
+commandFailed=Comando {0} fallito:
+commandHelpFailedForPlugin=Errore nella guida di: {0}
+commandNotLoaded=\u00a7cIl comando {0} non e'' stato caricato correttamente.
+compassBearing=\u00a77Bussola: {0} ({1} gradi).
+configFileMoveError=Impossibile spostare config.yml nel backup.
+configFileRenameError=Impossibile rinominare il file temporale in config.yml
+connectedPlayers=Players connessi:
+connectionFailed=Connessione fallita.
+cooldownWithMessage=\u00a7cIn esaurimento: {0}
+corruptNodeInConfig=\u00a74Avviso: errore nel tuo file di configurazione, nodo {0}.
+couldNotFindTemplate=Non trovo il template {0}
+creatingConfigFromTemplate=Configurazione dal template: {0}
+creatingEmptyConfig=Configurazione vuota creata: {0}
+creative=creativo
+currency={0}{1}
+currentWorld=Current World: {0}
+day=giorno
+days=giorni
+defaultBanReason=Sei stato bannato!
+deleteFileError=Impossibile eliminare il file: {0}
+deleteHome=\u00a77La home {0} e'' stata rimossa.
+deleteJail=\u00a77La prigione {0} e'' stata rimossa.
+deleteWarp=\u00a77Il Warp {0} e'' stato rimosso.
+deniedAccessCommand={0} Accesso negato al comando.
+dependancyDownloaded=[Essentials] Dependancy {0} download effettuato con successo.
+dependancyException=[Essentials] Errore durante il download di una dependacy
+dependancyNotFound=[Essentials] Una dependancy necessaria non e'' stata trovata, sto effettuando il download..
+depth=\u00a77Sei al livello del mare.
+depthAboveSea=\u00a77Sei {0} blocco(i) sopra il livello del mare.
+depthBelowSea=\u00a77Sei {0} blocco(i) sotto il livello del mare.
+destinationNotSet=Destinazione non impostata
+disableUnlimited=\u00a77Collocazione illimitata di {0} per {1} disabilitata.
+disabled=disabilitato
+disabledToSpawnMob=La creazione di questo mob e'' stata disabilitata nel file config.
+dontMoveMessage=\u00a77Il teletrasporto iniziera'' tra {0}. Attendi.
+downloadingGeoIp=Download del database GeoIP... potrebbe richiedere del tempo (nazione: 0.6 MB, citta'': 20MB)
+duplicatedUserdata=Dati dell''utente duplicati: {0} e {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
+enableUnlimited=\u00a77Sto inviando una quantita'' illimitata di {0} a {1}.
+enabled=abilitato
+enchantmentApplied = \u00a77L''incantesimo {0} e'' stato applicato all''oggetto nelle tue mani.
+enchantmentNotFound = \u00a7cIncantesimo non trovato
+enchantmentPerm = \u00a7cNon hai il permesso per {0}
+enchantmentRemoved = \u00a77L''incantesimo {0} e'' stato rimosso dall''oggetto nelle tue mani.
+enchantments = \u00a77Incantesimi: {0}
+errorCallingCommand=Errore di chiamata del comando /{0}
+errorWithMessage=\u00a7cErrore: {0}
+essentialsHelp1=File corrotto.. Essentials non riesce ad aprirlo. Essentials ora e'' disabilitato. Se non riesci a riparare il file, vai su http://tiny.cc/EssentialsChat
+essentialsHelp2=File corrotto.. Essentials non riesce ad aprirlo. Essentials ora e'' disabilitato. Se non riesci a riparare il file, digita il comando /essentialshelp o vai su http://tiny.cc/EssentialsChat
+essentialsReload=\u00a77Essentials Ricaricato {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
+extinguish=\u00a77Hai spento le fiamme.
+extinguishOthers=\u00a77Hai spento le fiamme di {0}.
+failedToCloseConfig=Chiusura fallita del config {0}
+failedToCreateConfig=Creazione fallita del config {0}
+failedToWriteConfig=Scrittura fallita del config {0}
+false=\u00a74false\u00a7f
+feed=\u00a77Ora sei sazio.
+feedOther=\u00a77{0} e''stato nutrito.
+fileRenameError=Rinomina del file {0} fallita
+flyMode=\u00a77Modalita'' volo impostata {0} per {1}.
+flying=flying
+foreverAlone=\u00a7cNon c''e'' nessuno a cui rispondere.
+freedMemory=Liberati {0} MB.
+gameMode=\u00a77Modalita''di gioco {0} impostata per {1}.
+gcchunks= blocchi,
+gcentities= entita''
+gcfree=Memoria libera: {0} MB
+gcmax=Memoria massima: {0} MB
+gctotal=Memoria allocata: {0} MB
+geoIpUrlEmpty=L''url del download di GeoIP e'' vuoto.
+geoIpUrlInvalid=L''url del download di GeoIP non e'' valido.
+geoipJoinFormat=Il Player {0} proviene da {1}
+godDisabledFor=God disabilitato per {0}
+godEnabledFor=God abilitato per {0}
+godMode=\u00a77Modalita'' God {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
+haveBeenReleased=\u00a77Sei stato scarcerato.
+heal=\u00a77Sei stato curato.
+healOther=\u00a77{0} e'' stato curato.
+helpConsole=Digitare ? per la guida.
+helpFrom=\u00a77Comandi da {0}:
+helpLine=\u00a76/{0}\u00a7f: {1}
+helpMatching=\u00a77Corrispondenza comandi "{0}":
+helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
+helpPages=Pagina \u00a7c{0}\u00a7f di \u00a7c{1}\u00a7f:
+helpPlugin=\u00a74{0}\u00a7f: Plugin Help: /help {1}
+holeInFloor=Buco nel terreno
+homeSet=\u00a77Home impostata.
+homeSetToBed=\u00a77La tua home e'' ora assegnata a questo letto.
+homes=Homes: {0}
+hour=ora
+hours=ore
+ignorePlayer=Da ora in poi ignorerai {0}.
+illegalDate=Formato data/ora non riconosciuto.
+infoChapter=Seleziona capitolo:
+infoChapterPages=Capitolo {0}, pagina \u00a7c{1}\u00a7f di \u00a7c{2}\u00a7f:
+infoFileDoesNotExist=Il file info.txt non esiste. Creane uno per te.
+infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Pagina \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
+infoUnknownChapter=Capitolo sconosciuto.
+invBigger=L''inventario degli altri utenti e'' piu'' grande del tuo.
+invRestored=l tuo inventario e'' stato ripristinato.
+invSee=Stai guardando l''inventario di {0}.
+invSeeHelp=Digita /invsee per ripristinare il tuo inventario.
+invalidCharge=\u00a7cIIstruzione non corretta.
+invalidHome=La home {0} non esiste
+invalidMob=Tipo mob non valido.
+invalidServer=Server non valido!
+invalidSignLine=Riga {0} non corretta.
+invalidWorld=\u00a7cMondo incorretto.
+inventoryCleared=\u00a77Inventario cancellato.
+inventoryClearedOthers=\u00a77Inventario di \u00a7c{0}\u00a77 cancellato.
+is=e''
+itemCannotBeSold=L''oggetto non puo'' essere venduto.
+itemMustBeStacked=L''oggetto deve essere commerciato in pile. 2 quantita'' equivalgono a 2 pile, etc.
+itemNotEnough1=\u00a7cNon hai abbastanza quantita'' di questo oggetto per venderlo.
+itemNotEnough2=\u00a77Se vuoi vendere tutti gli oggetti di quel tipo, digita /sell nomeoggetto
+itemNotEnough3=\u00a77/sell nomeoggetto -1 vende tutto tranne quell''oggetto, etc.
+itemSellAir=Stai cercando di vendere l''aria? Metti un oggetto nella tua mano.
+itemSold=\u00a77Venduto per \u00a7c{0} \u00a77({1} {2} a {3} l''uno)
+itemSoldConsole={0} venduto {1} per \u00a77{2} \u00a77({3} oggetti a {4} l''uno)
+itemSpawn=\u00a77Inviati {0} di {1}
+itemsCsvNotLoaded=Impossibile caricare items.csv.
+jailAlreadyIncarcerated=\u00a7cPlayer gia'' in prigione: {0}
+jailMessage=\u00a7cAvrai tempo per riflettere..in prigione.
+jailNotExist=La prigione dichiarata non esiste.
+jailReleased=\u00a77Player \u00a7e{0}\u00a77 scarcerato.
+jailReleasedPlayerNotify=\u00a77Sei stato scarcerato!
+jailSentenceExtended=Tempo di incarcerazione aumentato di: {0)
+jailSet=\u00a77{0} e'' ora una prigione.
+jumpError=Cosi'' facendo danneggerai la cpu.
+kickDefault=Kickato dal server
+kickExempt=\u00a7cNon puoi kickare questo player.
+kickedAll=\u00a7cKicked all players from server
+kill=\u00a77Ucciso {0}.
+kitError2=\u00a7cQuesto kit non esiste o non e'' definito.
+kitError=\u00a7cNon ci sono kit validi.
+kitErrorHelp=\u00a7cForse una quantita'' manca in un oggetto della configurazione?
+kitGive=\u00a77Kit inviato {0}.
+kitInvFull=\u00a7cIl tuo inventario e'' pieno, il kit e'' ora per terra.
+kitTimed=\u00a7cNon puoi usare il kit per altri {0}.
+kits=\u00a77Kits: {0}
+lightningSmited=\u00a77Sei stato folgorato!
+lightningUse=\u00a77{0} e'' stato folgorato!
+listAfkTag = \u00a77[AFK]\u00a7f
+listAmount = \u00a79Ci sono \u00a7c{0}\u00a79 players online su un massimo di \u00a7c{1}.
+listAmountHidden = \u00a79Ci sono \u00a7c{0}\u00a77/{1}\u00a79 players online su un massimo di \u00a7c{2}.
+listGroupTag={0}\u00a7f:
+listHiddenTag = \u00a77[HIDDEN]\u00a7f
+loadWarpError=Impossibile caricare il warp {0}
+localFormat=Formato locale: <{0}> {1}
+mailClear=\u00a7cPer cancellare la tua mail, digita /mail clear
+mailCleared=\u00a77Mail cancellata!
+mailSent=\u00a77Mail inviata!
+markMailAsRead=\u00a7cPer contrassegnare la mail come gia'' letta, digita /mail read
+markedAsAway=\u00a77Il tuo stato ora e'' "Non al computer".
+markedAsNotAway=\u00a77Bentornato!
+maxHomes=Non puoi assegnare piu'' di {0} home.
+mayNotJail=\u00a7cNon puoi imprigionare questo player.
+me=mi
+minute=minuto
+minutes=minuti
+missingItems=Non hai {0}x {1}.
+missingPrefixSuffix=Manca un prefisso o un suffisso per {0}
+mobSpawnError=Errore durante il cambiamento del generatore di mob.
+mobSpawnLimit=Quantita'' Mob limitata dal server
+mobSpawnTarget=Il blocco designato deve essere un generatore di mob.
+mobsAvailable=\u00a77Mobs: {0}
+moneyRecievedFrom=\u00a7a{0} sono stati ricevuti da {1}
+moneySentTo=\u00a7a{0} sono stati inviati a {1}
+moneyTaken={0} prelevati dal tuo conto in banca.
+month=mese
+months=mesi
+moreThanZero=La quantita'' deve essere maggiore di 0.
+msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
+muteExempt=\u00a7cNon puoi mutare questo player.
+mutedPlayer=Player {0} mutato.
+mutedPlayerFor=Player {0} mutato per {1}.
+mutedUserSpeaks={0} ha provato a parlare, ma e'' mutato.
+nearbyPlayers=Players nelle vicinanze: {0}
+negativeBalanceError=User is not allowed to have a negative balance.
+nickChanged=Nickname modificato.
+nickDisplayName=\u00a77Devi abilitare change-displayname nel config di Essentials.
+nickInUse=\u00a7cNickname gia'' in uso.
+nickNamesAlpha=\u00a7cI Nickname devono essere alfanumerici.
+nickNoMore=\u00a77Non disponi piu'' di un nickname.
+nickOthersPermission=\u00a7cNon hai il permesso di cambiare il nickname degli altri
+nickSet=\u00a77Il tuo nickname e'' ora \u00a7c{0}
+noAccessCommand=\u00a7cNon hai accesso a questo comando.
+noAccessPermission=\u00a7cNon hai i permessi di accesso per {0}.
+noBreakBedrock=Non sei abilitato a distruggere la bedrock.
+noDestroyPermission=\u00a7cNon hai i permessi per distruggere {0}.
+noDurability=\u00a7cThis item does not have a durability.
+noGodWorldWarning=\u00a7cAttenzione! Modalita'' God disabilitata in questo mondo.
+noHelpFound=\u00a7cComandi non trovati.
+noHomeSet=Non hai stabilito una home.
+noHomeSetPlayer=Il Player non ha stabilito una home.
+noKitPermission=\u00a7cHai bisogno del permesso \u00a7c{0}\u00a7c per usare questo kit.
+noKits=\u00a77Non ci sono ancora kit disponibili
+noMail=Non hai ricevuto nessuna mail
+noMotd=\u00a7cNon c''e'' nessun messaggio del giorno.
+noNewMail=\u00a77Non hai ricevuto nuove mail.
+noPendingRequest=Non hai richieste in sospeso.
+noPerm=\u00a7cNon hai questo permesso: \u00a7f{0}
+noPermToSpawnMob=\u00a7cNon hai i permessi per generare questo mob.
+noPlacePermission=\u00a7cNon hai il permesso di collocare un blocco accanto a quest''insegna.
+noPowerTools=Non hai attrezzi assegnati.
+noRules=\u00a7cNon ci sono regole specifiche al momento.
+noWarpsDefined=Nessun warp definito
+none=nessun
+notAllowedToQuestion=\u00a7cNon sei autorizzato a fare domande.
+notAllowedToShout=\u00a7cNon sei autorizzato a gridare.
+notEnoughExperience=Non hai abbastanza esperienza.
+notEnoughMoney=Non hai abbastanza denaro.
+notFlying=not flying
+notRecommendedBukkit=* ! * La versione Bukkit in uso non e'' compatibile con Essentials.
+notSupportedYet=Non ancora supportato.
+nothingInHand = \u00a7cNon hai niente in mano.
+now=adesso
+nuke=Un regalino.. radioattivo
+numberRequired=Che ne dici di metterci un numero?!
+onlyDayNight=/time supporta solo day/night.
+onlyPlayers=Solo i players durante il gioco possono usare {0}.
+onlySunStorm=/weather supporta solo sun/storm.
+orderBalances=Sto ordinando i bilanci di {0} utenti, attendere grazie...
+pTimeCurrent=L''orario di \u00a7e{0}\u00a7f e'' {1}.
+pTimeCurrentFixed=L''orario di \u00a7e{0}\u00a7f e'' fissato alle {1}.
+pTimeNormal=L''orario di \u00a7e{0}\u00a7f e'' normale e corrisponde a quello del server.
+pTimeOthersPermission=\u00a7cNon sei autorizzato a definre l''orario degli altri player.
+pTimePlayers=Questi player hanno il loro orario:
+pTimeReset=L''orario del Player e'' stato resettato alle: \u00a7e{0}
+pTimeSet=L''orario del Player e'' stato regolato alle \u00a73{0}\u00a7f per le: \u00a7e{1}
+pTimeSetFixed=L''orario del Player e'' stato fissato alle \u00a73{0}\u00a7f per le: \u00a7e{1}
+parseError=Errore parsing {0} riga {1}
+pendingTeleportCancelled=\u00a7cRichiesta in sospeso di teletrasporto cancellata.
+permissionsError=Mancano i permessi per Permissions/GroupManager; i suffissi e prefissi in chat verrano disabilitati.
+playerBanned=\u00a7cIl Player {0} e'' bannato {1} motivo: {2}
+playerInJail=\u00a7cIl Player e'' gia'' nella prigione ({0}).
+playerJailed=\u00a77Il Player {0} e'' stato messo in prigione.
+playerJailedFor= \u00a77Il Player {0} e'' in prigione. motivo: {1}.
+playerKicked=\u00a7cIl Player {0} e'' stato kickato {1} motivo: {2}
+playerMuted=\u00a77Sei stato mutato
+playerMutedFor=\u00a77Sei stato mutato per {0}
+playerNeverOnServer=\u00a7cIl Player {0} non e'' mai stato su questo server.
+playerNotFound=\u00a7cPlayer non trovato.
+playerUnmuted=\u00a77Sei stato smutato
+pong=Pong!
+possibleWorlds=\u00a77I mondi sono numerati da 0 a {0}.
+powerToolAir=Il comando non puo'' essere collegato all''aria.
+powerToolAlreadySet=Il comando \u00a7c{0}\u00a7f e'' gia'' stato assegnato a {1}.
+powerToolAttach=Il comando \u00a7c{0}\u00a7f e'' stato assegnato a {1}.
+powerToolClearAll=Tutti i comandi per gli attrezzi sono stati cancellati.
+powerToolList=L''attrezzo {1} ha i seguenti comandi: \u00a7c{0}\u00a7f.
+powerToolListEmpty=L''attrezzo {0} non dispone di comandi assegnati.
+powerToolNoSuchCommandAssigned=Il comando \u00a7c{0}\u00a7f non e'' stato assegnato a {1}.
+powerToolRemove=Il comando \u00a7c{0}\u00a7f e'' stato rimosso da {1}.
+powerToolRemoveAll=Tutti i comandi sono stati rimossi da {0}.
+powerToolsDisabled=Tutti i tuoi attrezzi sono stati disabilitati.
+powerToolsEnabled=Tutti i tuoi attrezzi sono stati abilitati.
+protectionOwner=\u00a76[EssentialsProtect] Protetto dal proprietario: {0}
+questionFormat=\u00a77[Domanda]\u00a7f {0}
+readNextPage=Digita /{0} {1} per la pagina successiva
+reloadAllPlugins=\u00a77Tutti i plugins ricaricati.
+removed=\u00a77Rimosse {0} entitita''.
+repair=Hai riparato con successo il tuo: \u00a7e{0}.
+repairAlreadyFixed=\u00a77Questo oggetto non richiede riparazioni.
+repairEnchanted=\u00a77Non sei abilitato a riparare oggetti magici.
+repairInvalidType=\u00a7cQuesto oggetto non puo'' essere riparato.
+repairNone=Non ci sono oggetti da riparare.
+requestAccepted=\u00a77Richiesta di teletrasporto accettata.
+requestAcceptedFrom=\u00a77{0} ha accettato la tua richiesta di teletrasporto.
+requestDenied=\u00a77Richiesta di teletrasporto rifiutata.
+requestDeniedFrom=\u00a77{0} ha rifiutato la tua richiesta di teletrasporto.
+requestSent=\u00a77Richiesta inviata a {0}\u00a77.
+requestTimedOut=\u00a7cRichiesta di teletrasporto scaduta.
+requiredBukkit=* ! * e'' necessaria la versione {0} o superiore di CraftBukkit, scaricabile da http://dl.bukkit.org/downloads/craftbukkit/
+returnPlayerToJailError=Riscontrato errore nell''invio del player {0} alla prigione: {1}
+second=secondo
+seconds=secondi
+seenOffline=Il Player {0} e'' offline da {1}
+seenOnline=Il Player {0} e'' online da {1}
+serverFull=Il Server e'' pieno
+serverTotal=Totale Server: {0}
+setSpawner=Tipo generatore modificato in {0}
+sheepMalformedColor=Colore non valido.
+shoutFormat=\u00a77[Grido!]\u00a7f {0}
+signFormatFail=\u00a74[{0}]
+signFormatSuccess=\u00a71[{0}]
+signFormatTemplate=[{0}]
+signProtectInvalidLocation=\u00a74Non hai il permesso per creare segnaposti qui.
+similarWarpExist=Il nome del warp e'' stato gia'' utilizzato.
+slimeMalformedSize=Dimensione non valida.
+soloMob=Quel mob sembra essere solo
+spawnSet=\u00a77Punto di rigenerazione creato per il gruppo {0}.
+spawned=creato
+sudoExempt=Impossibile applicare il sudo a questo utente
+sudoRun=Sto obbligando {0} ad eseguire: /{1} {2}
+suicideMessage=\u00a77Addio mondo crudele...
+suicideSuccess= \u00a77{0} si e'' suicidato..
+survival=sopravvivenza
+takenFromAccount=\u00a7c{0} sono stati prelevati dal tuo conto.
+takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
+teleportAAll=\u00a77Richiesta di teletrasporto inviata a tutti i players...
+teleportAll=\u00a77Sto teletrasportando tutti i players...
+teleportAtoB=\u00a77{0}\u00a77 ti ha teletrasportato a {1}\u00a77.
+teleportDisabled={0} ha il teletrasporto disabilitato.
+teleportHereRequest=\u00a7c{0}\u00a7c ha richiesto di teletrasportati da loro.
+teleportNewPlayerError=Teletrasporto del nuovo player fallito
+teleportRequest=\u00a7c{0}\u00a7c ha richiesto di teletrasportati da te.
+teleportRequestTimeoutInfo=\u00a77Questa richiesta scadra'' tra {0} secondi.
+teleportTop=\u00a77Teletrasporto in cima.
+teleportationCommencing=\u00a77Inizio teletrasporto...
+teleportationDisabled=\u00a77Teletrasporto disabilitato.
+teleportationEnabled=\u00a77Teletrasporto abilitato.
+teleporting=\u00a77Teletrasporto in corso...
+teleportingPortal=\u00a77Teletrasporto tramite portale.
+tempBanned=Bannato temporaneamente dal server per {0}
+tempbanExempt=\u00a77Non puoi bannare questo player
+thunder=Abilita i filmini dal cielo: {0}
+thunderDuration=Abilita i filmini dal cielo: {0} per {1} secondi.
+timeBeforeHeal=Tempo rimanente alla prossima cura: {0}
+timeBeforeTeleport=Tempo rimanente al prossimo teletrasporto: {0}
+timeFormat=\u00a73{0}\u00a7f oppure \u00a73{1}\u00a7f oppure \u00a73{2}\u00a7f
+timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
+timeSet=Orario definito in tutti i mondi.
+timeSetPermission=\u00a7cNon sei autorizzato a regolare l''orario.
+timeWorldCurrent=L''orario attuale in {0} e'' \u00a73{1}
+timeWorldSet=L''orario e'' stato regolato alle {0} in: \u00a7c{1}
+tps=Current TPS = {0}
+tradeCompleted=\u00a77Affare concluso.
+tradeSignEmpty=L''insegna non dispone di forniture sufficienti.
+tradeSignEmptyOwner=Non c''e'' niente da raccogliare da quest''insegna.
+treeFailure=\u00a7cCreazione dell''albero fallita. Riprova sull''erba o sul terreno.
+treeSpawned=\u00a77Albero generato.
+true=\u00a72true\u00a7f
+typeTpaccept=\u00a77Per accetare il teletrasprto, digita \u00a7c/tpaccept\u00a77.
+typeTpdeny=\u00a77Per rifiutare il teletrasporto, digita \u00a7c/tpdeny\u00a77.
+typeWorldName=\u00a77Puoi digitare anche il nome di un mondo.
+unableToSpawnMob=Impossibile generare il mob.
+unbannedIP=IP address abilitato.
+unbannedPlayer=Player abilitato.
+unignorePlayer=Non stai piu'' ignorando il player {0}.
+unknownItemId=ID oggetto sconosciuto: {0}
+unknownItemInList=Oggetto {0} sconosciuto nella lista {1}.
+unknownItemName=Nome oggetto sconosciuto: {0}
+unlimitedItemPermission=\u00a7cNessun permesso per l''oggetto {0} illimitato.
+unlimitedItems=Oggetti illimitati:
+unmutedPlayer=Player {0} smutato.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
+upgradingFilesError=Errore durante l''aggiornamento dei file
+userDoesNotExist=L''utente {0} non esiste.
+userIsAway={0} e'' AFK
+userIsNotAway={0} non e'' piu'' AFK
+userJailed=\u00a77Sei stato messo in prigione
+userUsedPortal={0} ha usato un portale.
+userdataMoveBackError=Errore durante lo spostamento di userdata/{0}.tmp a userdata/{1}
+userdataMoveError=Errore durante lo spostamento di userdata/{0} a userdata/{1}.tmp
+usingTempFolderForTesting=Sto usando la cartella temporale per il test:
+vanished=\u00a7aYou have now been vanished.
+versionMismatch=Versione incorretta! Aggiornare {0} alla stessa versione.
+versionMismatchAll=Versione incorretta! Aggiornare tutti i jar Essentials alla stessa versione.
+voiceSilenced=\u00a77La tua voce e'' stata silenziata
+warpDeleteError=Problema nell''eliminazione del file warp.
+warpListPermission=\u00a7cNon hai i permessi per consultare la lista warps.
+warpNotExist=Questo warp non esiste.
+warpOverwrite=\u00a7cNon puoi sovrascrivere il warp.
+warpSet=\u00a77Warp {0} definito.
+warpUsePermission=\u00a7cNon hai i permessi per usare questo warp.
+warpingTo=\u00a77Warping a {0}.
+warps=Warps: {0}
+warpsCount=\u00a77Ci sono {0} warps. Pagina {1} of {2}.
+weatherStorm=\u00a77Hai regolato il tempo in tempesta in {0}
+weatherStormFor=\u00a77Hai cambiato il tempo in tempesta in {0} per {1} secondi
+weatherSun=\u00a77Hai cambiato il tempo in soleggiato in {0}
+weatherSunFor=\u00a77Hai cambiato il tempo in soleggiato in {0} per {1} secondi
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Bannati:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Livello {1})
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Gamemode:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Posizione:\u00a7f {0}
+whoisGod=\u00a76 - God mode:\u00a7f {0}
+whoisHealth=\u00a76 - Health:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP Address:\u00a7f {0}
+whoisJail=\u00a76 - Imprigionati:\u00a7f {0}
+whoisLocation=\u00a76 - Posizione:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Denaro:\u00a7f {0}
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+worth=\u00a77Pila di {0} valore \u00a7c{1}\u00a77 ({2} oggetto(i) a {3} l''uno)
+worthMeta=\u00a77Pila di {0} con metadati di {1} valore \u00a7c{2}\u00a77 ({3} oggetto(i) a {4} l''uno)
+worthSet=Valore definito
+year=anno
+years=anni
+youAreHealed=\u00a77Sei stato curato.
+youHaveNewMail=\u00a7cHai {0} messaggi!\u00a7f digita \u00a77/mail read\u00a7f per consultare la tua mail.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index d0f56752b..1937db5a2 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -3,102 +3,108 @@
# Translations start here
# by: Geertje123
action=* {0} {1}
-addedToAccount=\u00a7a{0} is gestort op je account.
-addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
+addedToAccount=\u00a7a{0} is gestort op je rekening.
+addedToOthersAccount=\u00a7a{0} toegevoegd aan {1}\u00a7a zijn rekening. Nieuw balans: {2}
alertBroke=gebroken:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3}
alertPlaced=geplaatst:
alertUsed=gebruikt:
-autoAfkKickReason=You have been kicked for idling more than {0} minutes.
-backAfterDeath=\u00a77Gebruik het /back command om terug te keren naar je sterfplaats.
+autoAfkKickReason=Je bent van de server afgeschopt omdat je niets hebt gedaan voor meer dan {0} minuten.
+backAfterDeath=\u00a77Gebruik het /back commando om terug te keren naar je sterfplaats.
backUsageMsg=\u00a77Naar de vorige locatie aan het gaan.
-backupDisabled=An external backup script has not been configured.
-backupFinished=Backup voltooid
-backupStarted=Backup gestart
+backupDisabled=Een extern backup script is niet geconfigureerd.
+backupFinished=Backup voltooid.
+backupStarted=Backup gestart.
balance=\u00a77Saldo: {0}
-balanceTop=\u00a77 Top saldi ({0})
+balanceTop=\u00a77 Top saldo ({0})
banExempt=\u00a77Je kunt deze speler niet verbannen.
-banIpAddress=\u00a77Verbannen IP-adres
+banIpAddress=\u00a77Verbannen IP-adres.
bannedIpsFileError=Fout bij het lezen van banned-ips.txt
-bannedIpsFileNotFound=banned-ips.txt werd niet gevonden
+bannedIpsFileNotFound=banned-ips.txt werd niet gevonden.
bannedPlayersFileError=Fout bij het lezen van banned-players.txt
-bannedPlayersFileNotFound=banned-players.txt werd niet gevonden
+bannedPlayersFileNotFound=banned-players.txt werd niet gevonden.
bigTreeFailure=\u00a7cMaken van een grote boom is mislukt. Probeer het opnieuw op gras of dirt.
bigTreeSuccess= \u00a77Grote boom gemaakt.
-blockList=Essentials relayed the following commands to another plugin:
-broadcast=[\u00a7cBroadcast\u00a7f]\u00a7a {0}
-buildAlert=\u00a7cJe bent niet bevoegd om te bouwen
+blockList=Essentials heeft de volgende commandos doorgegeven naar een andere plugin:
+broadcast=[\u00a7Uitzending\u00a7f]\u00a7a {0}
+buildAlert=\u00a7cJe bent niet bevoegd om te bouwen.
bukkitFormatChanged=Bukkit versie formaat veranderd. Versie niet nagekeken.
-burnMsg=\u00a77Je hebt {0} voor {1} seconde(n) in de fik gezet.
+burnMsg=\u00a77Je hebt {0} voor {1} seconde(n) in brand gezet.
canTalkAgain=\u00a77Je kan weer praten.
cantFindGeoIpDB=De GeoIP database kon niet gevonden worden!
cantReadGeoIpDB=Fout bij het lezen van de GeoIP database!
cantSpawnItem=\u00a7cJe bent niet bevoegd om {0} te spawnen.
chatTypeLocal=[L]
+chatTypeAdmin=[A]
chatTypeSpy=[Spy]
-commandFailed=Opdracht {0} mislukt:
+commandFailed=Opdracht {0} is mislukt:
commandHelpFailedForPlugin=Fout bij het \u200b\u200bkrijgen van hulp voor: {0}
commandNotLoaded=\u00a7cOpdracht {0} is fout geladen.
compassBearing=\u00a77Ligging: {0} ({1} graden).
configFileMoveError=Het verplaatsen van config.yml naar de backup locatie is mislukt.
configFileRenameError=Fout bij het hernoemen van de tijdelijke map naar config.yml
-connectedPlayers=Spelers online:
+connectedPlayers=Spelers online:
connectionFailed=Fout bij het verbinden.
cooldownWithMessage=\u00a7cAfkoeltijd: {0}
corruptNodeInConfig=\u00a74Waarschuwing: Het configuratiebestand bevat een fout {0}.
-couldNotFindTemplate=Het sjabloon kon niet worden gevonden {0}
+couldNotFindTemplate=Het sjabloon kon niet worden gevonden {0}.
creatingConfigFromTemplate=Bezig met aanmaken van een config vanaf sjabloon: {0}
creatingEmptyConfig=Bezig met een lege config aanmaken: {0}
creative=creative
currency={0}{1}
+currentWorld=Actuele Wereld: {0}
day=dag
days=dagen
-defaultBanReason=De Ban Hamer heeft gesproken!
+defaultBanReason=De Verbannings Hamer heeft gesproken!
deleteFileError=Het bestand kon niet verwijderd worden: {0}
-deleteHome=\u00a77Home {0} has been removed.
+deleteHome=\u00a77Huis {0} is verwijdered.
deleteJail=\u00a77Gevangenis {0} is verwijderd.
deleteWarp=\u00a77Warp {0} is verwijderd.
deniedAccessCommand={0} was de toegang verboden tot het commando.
dependancyDownloaded=[Essentials] Afhankelijkheid {0} succesvol gedownload.
-dependancyException=[Essentials] Er is een fout opgetreden bij het downloaden van de afhankelijkheid
+dependancyException=[Essentials] Er is een fout opgetreden bij het downloaden van de afhankelijkheid.
dependancyNotFound=[Essentials] Een afhankelijkheid is niet gevonden. Start downloaden.
depth=\u00a77Je zit op zeeniveau.
depthAboveSea=\u00a77Je zit {0} blok(ken) boven zeeniveau.
depthBelowSea=\u00a77Je zit {0} blok(ken) onder zeeniveau.
-destinationNotSet=Bestemming niet ingesteld
+destinationNotSet=Bestemming niet ingesteld.
disableUnlimited=\u00a77Oneindig plaatsen van {0} uitgeschakeld voor {1}.
disabled=uitgeschakeld
-disabledToSpawnMob=Spawning this mob was disabled in the config file.
+disabledToSpawnMob=Het voortbrengen van mobs is uitgeschakeld in het configuratie bestand.
dontMoveMessage=\u00a77Beginnen met teleporteren in {0}. Niet bewegen.
downloadingGeoIp=Bezig met downloaden van GeoIP database ... Dit kan een tijdje duren (country: 0.6 MB, city: 20MB)
-duplicatedUserdata=Dubbele userdata: {0} en {1}.
+duplicatedUserdata=Dubbele gebruikersdata: {0} en {1}.
+durability=\u00a77Dit gereedschap kan nog \u00a7c{0}\u00a77 gebruikt worden.
enableUnlimited=\u00a77Oneindig aantal {0} aan {1} gegeven.
enabled=ingeschakeld
-enchantmentApplied = \u00a77The enchantment {0} has been applied to your item in hand.
-enchantmentNotFound = \u00a7cEnchantment not found
-enchantmentPerm = \u00a7cYou do not have the permission for {0}
-enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item in hand.
-enchantments = \u00a77Enchantments: {0}
+enchantmentApplied = \u00a77De betovering {0} is toegepast aan het voorwerp in je hand.
+enchantmentNotFound = \u00a7Betovering niet gevonden.
+enchantmentPerm = \u00a7cJe hebt geen toestemming voor {0}.
+enchantmentRemoved = \u00a77De betovering {0} is verwijderd van het voorwerp in je hand.
+enchantments = \u00a77Betoveringen: {0}
errorCallingCommand=Fout bij het aanroepen van de opdracht /{0}
errorWithMessage=\u00a7cFout: {0}
-essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
-essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
+essentialsHelp1=Het bestand is beschadigd en Essentials kan het niet openenen. Essentials is nu uitgeschakeld. Als je dit probleem niet zelf kan oplossing ga dan naar http://tiny.cc/EssentialsChat
+essentialsHelp2=Het bestand is beschadigd en Essentials kan het niet openenen. Essentials is nu uitgeschakeld. Als je dit probleem niet zelf kan oplossing ga dan naar http://tiny.cc/EssentialsChat of typ /essentialshelp in het spel.
essentialsReload=\u00a77Essentials is herladen {0}
+exp=\u00a7c{0} \u00a77heeft\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) en heeft nog\u00a7c {3} \u00a77exp meer nodig om een level hoger te gaan.
+expSet=\u00a7c{0} \u00a77heeft nu\u00a7c {1} \u00a77exp.
extinguish=\u00a77Je hebt jezelf geblust.
extinguishOthers=\u00a77Je hebt {0} geblust.
failedToCloseConfig=Fout bij het sluiten van config {0}
failedToCreateConfig=Fout tijdens het aanmaken van config {0}
failedToWriteConfig=Fout bij het cre\u00ebren van config {0}
-false=false
-feed=\u00a77Your appetite was sated.
-feedOther=\u00a77Satisfied {0}.
+false=\u00a74Onjuist\u00a7f
+feed=\u00a77Jouw honger is verzadigd.
+feedOther=\u00a7Verzadigd {0}.
fileRenameError=Hernoemen van {0} mislukt
-flyMode=\u00a77Set fly mode {0} for {1}.
+flyMode=\u00a77Zet vlieg modus {0} voor {1}.
+flying=vliegen
foreverAlone=\u00a7cJe hebt niemand waarnaar je kan reageren.
freedMemory={0} MB gelost.
-gameMode=\u00a77Set game mode {0} for {1}.
+gameMode=\u00a77Zet spel modus {0} voor {1}.
gcchunks= chunks,
-gcentities= entities
+gcentities= entiteiten
gcfree=Vrij geheugen: {0} MB
gcmax=Maximaal geheugen: {0} MB
gctotal=Gealloceerd geheugen: {0} MB
@@ -107,14 +113,18 @@ geoIpUrlInvalid=GeoIP download url is ongeldig.
geoipJoinFormat=Speler {0} komt uit {1}
godDisabledFor=uitgeschakeld voor {0}
godEnabledFor=ingeschakeld voor {0}
-godMode=\u00a77God mode {0}.
+godMode=\u00a77God modus {0}.
+hatArmor=\u00a7cFout, je kunt dit voorwerp niet als hoed gebruiken.
+hatEmpty=\u00a7cJe draagt geen hoed.
+hatFail=\u00a7cJe hebt iets nodig om te dragen als hoed.
+hatPlaced=\u00a7eGeniet van je nieuwe hoed!
haveBeenReleased=\u00a77Je bent bevrijdt
heal=\u00a77Je bent genezen.
healOther=\u00a77Je geneezde {0}.
helpConsole=type ? om de consolehelp weer te geven.
helpFrom=\u00a77Commands from {0}:
helpLine=\u00a76/{0}\u00a7f: {1}
-helpMatching=\u00a77Commands matching "{0}":
+helpMatching=\u00a77Commandos overeenkomen met "{0}":
helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
helpPages=Pagina \u00a7c{0}\u00a7f van de \u00a7c{1}\u00a7f:
helpPlugin=\u00a74{0}\u00a7f: Plugin Help: /help {1}
@@ -131,18 +141,18 @@ infoChapterPages=Hoofdstuk {0}, Pagina \u00a7c{1}\u00a7f van de \u00a7c{2}\u00a7
infoFileDoesNotExist=Bestand info.txt bestaat niet. Bezig met aanmaken.
infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Pagina \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
infoUnknownChapter=Onbekend hoofdstuk.
-invBigger=De inventory van de andere speler is groter dan die van jou.
-invRestored=Je inventory is hersteld.
+invBigger=De inventaris van de andere speler is groter dan die van jou.
+invRestored=Je inventaris is hersteld.
invSee=Je kijkt naar de inventory van {0}.
-invSeeHelp=Type /invsee om je inventory te herstellen.
+invSeeHelp=Type /invsee om je inventaris te herstellen.
invalidCharge=\u00a7cOngeldig te laden.
-invalidHome=Home {0} doesn't exist
+invalidHome=Huis {0} Bestaat niet.
invalidMob=Ongeldig mob type.
invalidServer=Ongeldige server!
invalidSignLine=Regel {0} op het bordje is ongeldig.
invalidWorld=\u00a7cOngeldige wereld.
-inventoryCleared=\u00a77inventory leeggemaakt.
-inventoryClearedOthers=\u00a77inventory van \u00a7c{0}\u00a77 leeggemaakt.
+inventoryCleared=\u00a7inventaris leeggemaakt.
+inventoryClearedOthers=\u00a7inventaris van \u00a7c{0}\u00a77 leeggemaakt.
is=is
itemCannotBeSold=Dat voorwerp kan niet aan de server worden verkocht.
itemMustBeStacked=Voorwerp moet geruild worden als stapel. Een hoeveelheid van 2 moet dus geruild worden als twee stapels, etc.
@@ -154,78 +164,80 @@ itemSold=\u00a77Verkocht voor \u00a7c{0} \u00a77({1} {2} voorwerpen voor {3} per
itemSoldConsole={0} verkocht {1} voor \u00a77{2} \u00a77({3} voorwerpen voor {4} per stuk)
itemSpawn=\u00a77Geeft {0} {1}
itemsCsvNotLoaded=De item kunnen niet geladen worden.csv.
-jailAlreadyIncarcerated=\u00a7cPerson is already in jail: {0}
-jailMessage=\u00a7cYou do the crime, you do the time.
+jailAlreadyIncarcerated=\u00a7cDeze persoon zit al in de gevangenis: {0}
+jailMessage=\u00a7cJij begaat het misdrijf, jij zit je tijd uit.
jailNotExist=Die gevangenis bestaat niet.
-jailReleased=\u00a77Player \u00a7e{0}\u00a77 unjailed.
-jailReleasedPlayerNotify=\u00a77You have been released!
-jailSentenceExtended=Jail time extend to: {0)
+jailReleased=\u00a77Speler \u00a7e{0}\u00a77 vrijgelaten.
+jailReleasedPlayerNotify=\u00a77Je bent vrijgelaten!
+jailSentenceExtended=Gevangenistijd verlengt tot: {0)
jailSet=\u00a77Gevangenis {0} is ingesteld
jumpError=Dat zou je computers hersenen beschadigen.
-kickDefault=Gekicked van de server
-kickExempt=\u00a77Je kunt die speler niet schoppen.
+kickDefault=Je bent van de server afgeschopt.
+kickExempt=\u00a77Je kunt die speler niet van de server afschoppen.
+kickedAll=\u00a7cAlle spelers van de server afgeschopt.
kill=\u00a77Jij doodde {0}.
kitError2=\u00a7cDie kit bestaat niet of is verkeerde beschreven.
kitError=\u00a7cEr zijn geen geldige kits.
kitErrorHelp=\u00a7cMisschien mist er een hoeveelheid van het item in de configuratie?
kitGive=\u00a77Kit {0} wordt gegeven.
-kitInvFull=\u00a7cJe inventory was vol, de kit wordt op de grond geplaatst
+kitInvFull=\u00a7cJe inventaris was vol, de kit wordt op de grond geplaatst
kitTimed=\u00a7cJe kan die kit pas weer gebruiken over {0}.
kits=\u00a77Kits: {0}
lightningSmited=\u00a77Je bent zojuist verbrand
lightningUse=\u00a77Brand {0}
listAfkTag = \u00a77[AFK]\u00a7f
-listAmount = \u00a79There are \u00a7c{0}\u00a79 out of maximum \u00a7c{1}\u00a79 players online.
-listAmountHidden = \u00a79There are \u00a7c{0}\u00a77/{1}\u00a79 out of maximum \u00a7c{2}\u00a79 players online.
+listAmount = \u00a79Er zijn \u00a7c{0}\u00a79 van het maximum \u00a7c{1}\u00a79 spelers online.
+listAmountHidden = \u00a79Er zijn \u00a7c{0}\u00a77/{1}\u00a79 van het maximum \u00a7c{2}\u00a79 spelers online.
listGroupTag={0}\u00a7f:
-listHiddenTag = \u00a77[HIDDEN]\u00a7f
+listHiddenTag = \u00a77[VERBORGEN]\u00a7f
loadWarpError=Fout bij het laden van warp {0}
-localFormat=Local: <{0}> {1}
-mailClear=\u00a7cType /mail clear, om ej berichten als gelezen te markeren.
+localFormat=Lokaal: <{0}> {1}
+mailClear=\u00a7cType /mail clear, om je berichten als gelezen te markeren.
mailCleared=\u00a77Bericht geklaard!
mailSent=\u00a77Bericht verzonden!
markMailAsRead=\u00a7cType /mail clear, om je berichten als gelezen te markeren
markedAsAway=\u00a77Je staat nu als afwezig gemeld.
markedAsNotAway=\u00a77Je staat niet meer als afwezig gemeld.
-maxHomes=You cannot set more than {0} homes.
+maxHomes=Je kunt niet meer dan {0} huizen zetten.
mayNotJail=\u00a7cJe mag die speler niet in de gevangenis zetten.
me=me
minute=minuut
minutes=minuten
missingItems=Je hebt geen {0}x {1}.
-missingPrefixSuffix=Er mist een prefix of suffix voor {0}
+missingPrefixSuffix=Er mist een voorvoegsel of navoegsel voor {0}
mobSpawnError=Fout bij het veranderen van de mob spawner.
-mobSpawnLimit=Grootte van de mob hang af van het server limiet
+mobSpawnLimit=Grootte van de mob hang af van het server limiet.
mobSpawnTarget=Target blok moet een mob spawner zijn.
mobsAvailable=\u00a77Mobs: {0}
moneyRecievedFrom=\u00a7a{0} is ontvangen van {1}
moneySentTo=\u00a7a{0} is verzonden naar {1}
-moneyTaken={0} van je bankrekening afgehaald.
+moneyTaken={0} van je rekening afgehaald.
month=maand
months=maanden
moreThanZero=Het aantal moet groter zijn dan 0.
msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
-muteExempt=\u00a7cJe kan deze speler niet muten.
-mutedPlayer=Speler {0} gemute.
-mutedPlayerFor=Speler {0} is gemute voor {1}.
-mutedUserSpeaks={0} probeerde te praten, maar is gemute.
-nearbyPlayers=Players nearby: {0}
+muteExempt=\u00a7cJe kan deze speler niet dempen.
+mutedPlayer=Speler {0} gedempt.
+mutedPlayerFor=Speler {0} is gedempt voor {1}.
+mutedUserSpeaks={0} probeerde te praten, maar is gedempt.
+nearbyPlayers=Spelers kortbij: {0}
negativeBalanceError=Speler is niet toegestaan om een negatief saldo te hebben.
-nickChanged=Nickname veranderd.
-nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
+nickChanged=Bijnaam veranderd.
+nickDisplayName=\u00a77Je moet 'change-displayname' inschakelen in de Essentials configuratie.
nickInUse=\u00a7cDie naam is al in gebruik.
-nickNamesAlpha=\u00a7cNicknames moeten alfanumeriek zijn.
-nickNoMore=\u00a7Je hebt geen nickname meer.
-nickOthersPermission=\u00a7cJe hebt geen toestemming om de nickname van anderen te veranderen
-nickSet=\u00a77Je nickname is nu \u00a7c{0}
+nickNamesAlpha=\u00a7cBijnamen moeten alfanumeriek zijn.
+nickNoMore=\u00a7Je hebt geen bijnaam meer.
+nickOthersPermission=\u00a7cJe hebt geen toestemming om de bijnaam van anderen te veranderen
+nickSet=\u00a77Je bijnaam is nu \u00a7c{0}
noAccessCommand=\u00a7cJe hebt geen toegang tot die opdracht.
noAccessPermission=\u00a7cJe hebt hier geen toegang voor {0}.
-noBreakBedrock=You are not allowed to destroy bedrock.
+noBreakBedrock=Je bent niet toegestaan om grondgesteente te breken.
noDestroyPermission=\u00a7cJe hebt geen toegang om dat te vernietigen {0}.
-noGodWorldWarning=\u00a7cWarning! God mode in this world disabled.
-noHelpFound=\u00a7cNo matching commands.
-noHomeSet=Je hebt geen home gemaakt.
-noHomeSetPlayer=Speler heeft geen home.
+noDurability=\u00a7cDit voorwerp heeft geen durabiliteit.
+noGodWorldWarning=\u00a7cWaarschuwing! God modus is uitgeschakeld in deze wereld.
+noHelpFound=\u00a7cGeen overeenkomende commandos.
+noHomeSet=Je hebt geen huis.
+noHomeSetPlayer=Speler heeft geen huis.
noKitPermission=\u00a7cJe hebt de \u00a7c{0}\u00a7c toestemming nodig om die kit te gebruiken.
noKits=\u00a77Er zijn nog geen kits beschikbaar
noMail=Je hebt geen berichten
@@ -233,30 +245,31 @@ noMotd=\u00a7cEr is geen bericht van de dag.
noNewMail=\u00a77Je hebt geen nieuwe berichten.
noPendingRequest=Je hebt geen aanvragen.
noPerm=\u00a7cJe hebt de \u00a7f{0}\u00a7c toestemming niet.
-noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
+noPermToSpawnMob=\u00a7cJe hebt geen toestemming om deze mob voort te brengen.
noPlacePermission=\u00a7cJe hebt geen toestemming om een blok naast die sign te plaatsen.
-noPowerTools=You have no power tools assigned.
+noPowerTools=Je hebt geen powertools toegewezen.
noRules=\u00a7cEr zijn nog geen regels gegeven.
noWarpsDefined=Geen warps gedefinieerd
none=geen
notAllowedToQuestion=\u00a7cJe bent niet bevoegd om de vraag functie te gebruiken.
notAllowedToShout=\u00a7cJe bent niet bevoegd om de roep functie te gebruiken.
-notEnoughExperience=You do not have enough experience.
+notEnoughExperience=Je hebt niet genoeg ervaring.
notEnoughMoney=Je hebt niet voldoende middelen.
+notFlying=Niet aan het vliegen.
notRecommendedBukkit=* ! * De Bukkit versie is niet de aangeraden build voor Essentials.
notSupportedYet=Nog niet ondersteund.
-nothingInHand = \u00a7cYou have nothing in your hand.
+nothingInHand = \u00a7cJe hebt niks in je hand.
now=nu
-nuke=May death rain upon them
+nuke=Moge de dood op hen neerregenen.
numberRequired=Er moet daar een nummer, grapjas.
onlyDayNight=/time ondersteund alleen day/night.
onlyPlayers=Alleen in-game spelers kunnen {0} gebruiken.
-onlySunStorm=/weather only supports sun/storm.
-orderBalances=Ordering balances of {0} users, please wait ...
-pTimeCurrent=\u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed=\u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal=\u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission=\u00a7cYou are not authorized to set other players'' time.
+onlySunStorm=/weather ondersteunt alleen sun/storm.
+orderBalances=Rekeningen bestellen van {0} gebruikers, Watch A.U.B ...
+pTimeCurrent=\u00a7e{0}'s\u00a7f tijd is {1}.
+pTimeCurrentFixed=\u00a7e{0}'s\u00a7f tijd is vastgezet op {1}.
+pTimeNormal=\u00a7e{0}'s\u00a7f tijd is normaal en komt overeen met de server.
+pTimeOthersPermission=\u00a7cJe bent niet bevoegd om een andere spelers' tijd te veranderen.
pTimePlayers=These players have their own time:
pTimeReset=Player time has been reset for: \u00a7e{0}
pTimeSet=Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
@@ -264,45 +277,45 @@ pTimeSetFixed=Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
parseError=Fout bij ontleding {0} op regel {1}
pendingTeleportCancelled=\u00a7cAangevraagde teleportatie afgelast.
permissionsError=Permissions/GroupManager ontbreekt; chat prefixes/suffixes worden uitgeschakeld.
-playerBanned=\u00a7cPlayer {0} banned {1} for {2}
+playerBanned=\u00a7cSpeler {0} verbant {1} voor {2}
playerInJail=\u00a7cSpeler zit al in de gevangenis {0}.
playerJailed=\u00a77Speler {0} is in de gevangenis gezet.
playerJailedFor= \u00a77Speler {0} is in de gevangenis gezet voor {1}.
-playerKicked=\u00a7cPlayer {0} kicked {1} for {2}
+playerKicked=\u00a7cSpeler {0} Schopt {1} van de server voor {2}
playerMuted=\u00a77Je kreeg het zwijgen opgelegd.
playerMutedFor=\u00a77Je kreeg het zwijgen opgelegd voor {0}
playerNeverOnServer=\u00a7cSpeler {0} is nooit op deze server geweest.
playerNotFound=\u00a7cSpeler niet gevonden.
playerUnmuted=\u00a77Speler mag weer praten
pong=Pong!
-possibleWorlds=\u00a77Mogelijk zijn de werelden de nummer 0 tot en met {0}.
-powerToolAir=Command kan niet worden bevestigd aan lucht.
-powerToolAlreadySet=Command \u00a7c{0}\u00a7f is already assigned to {1}.
-powerToolAttach=\u00a7c{0}\u00a7f command assigned to {1}.
-powerToolClearAll=All powertool commands have been cleared.
-powerToolList={1} has the following commands: \u00a7c{0}\u00a7f.
-powerToolListEmpty={0} has no commands assigned.
-powerToolNoSuchCommandAssigned=Command \u00a7c{0}\u00a7f has not been assigned to {1}.
-powerToolRemove=Command \u00a7c{0}\u00a7f removed from {1}.
-powerToolRemoveAll=All commands removed from {0}.
-powerToolsDisabled=All of your power tools have been disabled.
-powerToolsEnabled=All of your power tools have been enabled.
+possibleWorlds=\u00a77Mogelijke werelden zijn de nummers 0 tot en met {0}.
+powerToolAir=Commando kan niet worden bevestigd aan lucht.
+powerToolAlreadySet=Commando \u00a7c{0}\u00a7f is al toegewezen aan {1}.
+powerToolAttach=\u00a7c{0}\u00a7f commando toegewezen aan {1}.
+powerToolClearAll=Alle powertool commandos zijn verwijderd.
+powerToolList={1} heef de volgende commandos: \u00a7c{0}\u00a7f.
+powerToolListEmpty={0} heeft geen commandos toegewezen.
+powerToolNoSuchCommandAssigned=Commando \u00a7c{0}\u00a7f is niet toegewezen aan {1}.
+powerToolRemove=Commando \u00a7c{0}\u00a7f verwijderd van {1}.
+powerToolRemoveAll=Alle commandos verwijderd van {0}.
+powerToolsDisabled=Al jouw powertools zijn uitgeschakeld.
+powerToolsEnabled=Al jouw powertools zijn ingeschakeld.
protectionOwner=\u00a76[EssentialsProtect] Beschermingeigenaar: {0}
questionFormat=\u00a77[Vraag]\u00a7f {0}
-readNextPage=Type /{0} {1} to read the next page
+readNextPage=Type /{0} {1} om de volgende pagina te lezen.
reloadAllPlugins=\u00a77Alle plugins zijn herladen.
-removed=\u00a77Removed {0} entities.
-repair=You have successfully repaired your: \u00a7e{0}.
-repairAlreadyFixed=\u00a77This item does not need repairing.
-repairEnchanted=\u00a77You are not allowed to repair enchanted items.
-repairInvalidType=\u00a7cThis item cannot be repaired.
+removed=\u00a77{0} entiteiten verwijderd.
+repair=Je hebt succesvol je \u00a7e{0} \u00a7fverwijderd.
+repairAlreadyFixed=\u00a77Dit voorwerp hoeft niet gerepareerd te worden.
+repairEnchanted=\u00a77Je bent niet toegestaan om dit voorwerp te repareren.
+repairInvalidType=\u00a7cDit voorwerp kan niet gerepareerd worden.
repairNone=There were no items that needing repairing.
requestAccepted=\u00a77Teleporteer aanvraag geaccepteerd.
requestAcceptedFrom=\u00a77{0} accepted your teleport request.
requestDenied=\u00a77Teleporteer aanvraag geweigerd.
requestDeniedFrom=\u00a77{0} denied your teleport request.
requestSent=\u00a77Aanvraag verstuurd naar {0}\u00a77.
-requestTimedOut=\u00a7cTeleport request has timed out
+requestTimedOut=\u00a7cTeleportatie verzoek is verlopen.
requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://dl.bukkit.org/downloads/craftbukkit/
returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
second=seconde
@@ -310,35 +323,35 @@ seconds=seconde
seenOffline=Speler {0} is offline vanaf {1}
seenOnline=Speler {0} is online vanaf {1}
serverFull=Server is vol
-serverTotal=Server Total: {0}
-setSpawner=Changed spawner type to {0}
-sheepMalformedColor=Misvoormde kleur.
-shoutFormat=\u00a77[Shout]\u00a7f {0}
+serverTotal=Server Totaal: {0}
+setSpawner=Voortbrenger type veranderd tot {0}
+sheepMalformedColor=Misvormde kleur.
+shoutFormat=\u00a77[Schreeuw]\u00a7f {0}
signFormatFail=\u00a74[{0}]
signFormatSuccess=\u00a71[{0}]
signFormatTemplate=[{0}]
-signProtectInvalidLocation=\u00a74You are not allowed to create sign here.
+signProtectInvalidLocation=\u00a74Je bent niet bevoegd om hier een bord te plaatsen.
similarWarpExist=Er bestaat al een warp met dezelfde naam.
-slimeMalformedSize=Misvoormde grootte.
-soloMob=Die mob is liever in zijn eentje
+slimeMalformedSize=Misvormde grootte.
+soloMob=Die mob is liever in zijn eentje.
spawnSet=\u00a77Spawn locatie voor de groep {0} ingesteld.
-spawned=gespawned
-sudoExempt=You cannot sudo this user
-sudoRun=Forcing {0} to run: /{1} {2}
+spawned=voortgebracht
+sudoExempt=Je kunt deze speler niet sudo\u00ebn
+sudoRun={0} Forceren om te gebruiken: /{1} {2}
suicideMessage=\u00a77Vaarwel vreedzame wereld...
suicideSuccess= \u00a77{0} pleegde zelfmoord
survival=survival
-takenFromAccount=\u00a7c{0} is van je bank rekening afgehaald.
-takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
-teleportAAll=\u00a77Teleporting request sent to all players...
+takenFromAccount=\u00a7c{0} is van je rekening afgehaald.
+takenFromOthersAccount=\u00a7c{0} is van {1}\u00a7c's rekening gehaald. Nieuw saldo: {2}
+teleportAAll=\u00a77Teleportatie verzoek verzonden naar alle spelers...
teleportAll=\u00a77Bezig met teleporteren van alle spelers...
teleportAtoB=\u00a77{0}\u00a77 is naar {1}\u00a77 geteleporteerd.
teleportDisabled={0} heeft teleporteren uit gezet.
teleportHereRequest=\u00a7c{0}\u00a7c Heeft gevraagd of hij/zij naar jou mag teleporteren.
teleportNewPlayerError=Fout bij het teleporteren van nieuwe speler.
teleportRequest=\u00a7c{0}\u00a7c vraagt of hij jou kan teleporteren.
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-teleportTop=\u00a77Bezig met teleporteren naar de top.
+teleportRequestTimeoutInfo=\u00a77Dit verzoekt verloopt over {0} seconden.
+teleportTop=\u00a77Bezig met teleporteren naar het hoogste punt.
teleportationCommencing=\u00a77Aan het beginnen met teleporteren...
teleportationDisabled=\u00a77Teleportatie uitgeschakeld.
teleportationEnabled=\u00a77Teleportatie ingeschakeld.
@@ -353,16 +366,17 @@ timeBeforeTeleport=Afkoeltijd tot de volgende teleport: {0}
timeFormat=\u00a73{0}\u00a7f or \u00a73{1}\u00a7f or \u00a73{2}\u00a7f
timePattern=(?:([0-9]+)\\s*[yj][a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[oa][a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*[hu][a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
timeSet=Tijd ingesteld in alle werelden.
-timeSetPermission=\u00a7cYou are not authorized to set the time.
-timeWorldCurrent=The current time in {0} is \u00a73{1}
-timeWorldSet=The time was set to {0} in: \u00a7c{1}
+timeSetPermission=\u00a7cJe bent niet bevoegd om de tijd te veranderen.
+timeWorldCurrent=De actuele tijd in {0} is \u00a73{1}
+timeWorldSet=De tijd was veranderd naar {0} in: \u00a7c{1}
+tps=Huidige TPS = {0}
tradeCompleted=\u00a77Ruil verricht.
-tradeSignEmpty=Het handelsbordje heeft een te kleine voorraad.
-tradeSignEmptyOwner=There is nothing to collect from this trade sign.
-treeFailure=\u00a7cFout bij het genereren van boom. Pobeer het opnieuw op gras of dirt.
-treeSpawned=\u00a77Boom gespawned.
-true=true
-typeTpaccept=\u00a77Om te teleporten, type \u00a7c/tpaccept\u00a77.
+tradeSignEmpty=Dit handelsbord heeft een te kleine voorraad.
+tradeSignEmptyOwner=Er is niks te verzamelen bij dit handelsbord.
+treeFailure=\u00a7cFout bij het genereren van boom. Pobeer het opnieuw op gras of modder.
+treeSpawned=\u00a77Boom gegenereerd.
+true=\u00a72juist\u00a7f
+typeTpaccept=\u00a77Om te accepteren, type \u00a7c/tpaccept\u00a77.
typeTpdeny=\u00a77Om te weigeren, type \u00a7c/tpdeny\u00a77.
typeWorldName=\u00a77Je kan ook de exacte naam van de wereld typen.
unableToSpawnMob=De mob kan niet gespawned worden.
@@ -375,45 +389,50 @@ unknownItemName=Onbekende voorwerp naam: {0}
unlimitedItemPermission=\u00a7cOnbevoegd om oneindig {0} te hebben.
unlimitedItems=Oneindige voorwerpen:
unmutedPlayer=Speler {0} mag weer spreken.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cEen herlading heeft je geforceerd om zichtbaar te worden.
upgradingFilesError=Fout tijdens het upgraden van de bestanden
userDoesNotExist=Speler {0} bestaat niet.
-userIsAway={0} is nu AFK
-userIsNotAway={0} is niet meer AFK
+userIsAway={0} is nu afwezing.
+userIsNotAway={0} is niet meer afwezig.
userJailed=\u00a77Je bent in de gevangenis gezet.
userUsedPortal={0} gebruikte een bestaande uitgangs portal.
userdataMoveBackError=Fout bij het verplaasten van userdata/{0}.tmp naar userdata/{1}
userdataMoveError=Fout bij het verplaasten van userdata/{0} naar userdata/{1}.tmp
usingTempFolderForTesting=Tijdelijke map om te testen:
+vanished=\u00a7aJe bent nu verborgen.
versionMismatch=Verkeerde versie! Update {0} naar dezelfde versie.
versionMismatchAll=Verkeerde versie! Update alle Essentials jars naar dezelfde versie.
voiceSilenced=\u00a77Je kan niet meer praten
warpDeleteError=Fout bij het verwijderen van het warp bestand.
warpListPermission=\u00a7cJe hebt geen toegang om die warp te maken.
warpNotExist=Die warp bestaat niet.
-warpOverwrite=\u00a7cYou cannot overwrite that warp.
+warpOverwrite=\u00a7cJe kunt deze warp niet overschrijven.
warpSet=\u00a77Warp {0} ingesteld.
warpUsePermission=\u00a7cOnbevoegd om die warp te gebruiken.
warpingTo=\u00a77Aan het warpen naar {0}.
warps=Warps: {0}
-warpsCount=\u00a77There are {0} warps. Showing page {1} of {2}.
-weatherStorm=\u00a77Je hebt het weer naar storm gezet in de {0}
-weatherStormFor=\u00a77Je hebt het weer in de {0} naar storm gezet voor {1} seconde
-weatherSun=\u00a77Je hebt het weer naar zon gezet in de {0}
-weatherSunFor=\u00a77Je hebt het weer in de {0} naar zon gezet voor {1} seconde
-whoisBanned=\u00a79 - Banned: {0}
-whoisExp=\u00a79 - Exp: {0} (Level {1})
-whoisGamemode=\u00a79 - Gamemode: {0}
-whoisGeoLocation=\u00a79 - Locatie: {0}
-whoisGod=\u00a79 - God mode: {0}
-whoisHealth=\u00a79 - Levens: {0}/20
-whoisIPAddress=\u00a79 - IP Adres: {0}
-whoisIs={0} is {1}
-whoisJail=\u00a79 - Jail: {0}
-whoisLocation=\u00a79 - Locatie: ({0}, {1}, {2}, {3})
-whoisMoney=\u00a79 - Geld: {0}
-whoisOP=\u00a79 - OP: {0}
-whoisStatusAvailable=\u00a79 - Status: Beschikbaar
-whoisStatusAway=\u00a79 - Status: \u00a7cWeg\u00a7f
+warpsCount=\u00a77Er zijn {0} warps. Weergegeven pagina {1} van de {2}.
+weatherStorm=\u00a77Je hebt het weer naar stormachtig gezet in de {0}
+weatherStormFor=\u00a77Je hebt het weer in de {0} naar stormachtig gezet voor {1} seconde
+weatherSun=\u00a77Je hebt het weer naar zonnig gezet in de {0}
+weatherSunFor=\u00a77Je hebt het weer in de {0} naar zonnig gezet voor {1} seconde
+whoisAFK=\u00a76 - Afwezing:\u00a7f {0}
+whoisBanned=\u00a76 - Verbannen:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Vlieg modus:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Spelmodus:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Locatie:\u00a7f {0}
+whoisGod=\u00a76 - God modus:\u00a7f {0}
+whoisHealth=\u00a76 - Levens:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP Adres:\u00a7f {0}
+whoisJail=\u00a76 - Gevangenis:\u00a7f {0}
+whoisLocation=\u00a76 - Locatie:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Geld:\u00a7f {0}
+whoisMuted=\u00a76 - Gedempt:\u00a7f {0}
+whoisNick=\u00a76 - Naam:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
worth=\u00a77Stapel {0} met waarde \u00a7c{1}\u00a77 ({2} voorwerp(en) voor {3} per stuk)
worthMeta=\u00a77Stapel {0} met een metadata van {1} met waarde \u00a7c{2}\u00a77 ({3} voorwerp(en) voor {4} per stuk)
worthSet=Waarde ingesteld
@@ -421,3 +440,5 @@ year=jaar
years=jaren
youAreHealed=\u00a77Je bent genezen.
youHaveNewMail=\u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
new file mode 100644
index 000000000..f263a8ae9
--- /dev/null
+++ b/Essentials/src/messages_pl.properties
@@ -0,0 +1,444 @@
+#version: TeamCity
+# Single quotes have to be doubled: ''
+# Translations start here
+# by: losdamianos, edited by Rutr
+action=* {0} {1}
+addedToAccount=\u00a7a{0} zostalo dodane do twojego konta.
+addedToOthersAccount=\u00a7a{0} dodane do konta {1}\u00a7. Nowy stan konta: {2}.
+alertBroke=broke:
+alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
+alertPlaced=postawil:
+alertUsed=uzyl:
+autoAfkKickReason=Zostales wyrzucony z serwera za nie ruszanie sie przez wiecej niz {0} minut.
+backAfterDeath=\u00a77Uzyj komendy /back aby powrocic na miejsce swojej smierci.
+backUsageMsg=\u00a77Transportowanie do poprzedniej lokacji.
+backupDisabled=Zewnetrzny skrypt backupu nie zostal skonfigurowany.
+backupFinished=Backup zakonczony.
+backupStarted=Backup rozpoczety.
+balance=\u00a77Stan konta: {0}
+balanceTop=\u00a77Najbogatsi gracze ({0})
+banExempt=\u00a7cNie mozesz zbanowac tego gracza.
+banIpAddress=\u00a77Zbanowano adress IP
+bannedIpsFileError=Blad odczytu banned-ips.txt
+bannedIpsFileNotFound=banned-ips.txt nie znaleziony
+bannedPlayersFileError=Blad odczytu banned-players.txt
+bannedPlayersFileNotFound=banned-players.txt nie znaleziony
+bigTreeFailure=\u00a7cNie mozna tutaj postawic duzego drzewa. Sprobuj ponownie na ziemi lub trawie.
+bigTreeSuccess= \u00a77Utworzono duze drzewo.
+blockList=Essentials przekazuje nastepujace polecenie do innej wtyczki:
+broadcast=[\u00a7cOgloszenie\u00a7f]\u00a7a {0}
+buildAlert=\u00a7cNie mozesz tu budowac
+bukkitFormatChanged=Format wersji Bukkita jest zmieniony. Wersja nie jest sprawdzana.
+burnMsg=\u00a77Podpaliles {0} na {1} sekund.
+canTalkAgain=\u00a77Znow mozesz mowic.
+cantFindGeoIpDB=Nie mozna znalezc bazy danych GeoIP!
+cantReadGeoIpDB=Odczytywanie bazy danych GeoIP zawiodlo!
+cantSpawnItem=\u00a7cNie mozesz stworzyc przedmiotu {0}.
+chatTypeLocal=[L]
+chatTypeAdmin=[A]
+chatTypeSpy=[Szpieg]
+commandFailed=Komenda {0} zawiodla.
+commandHelpFailedForPlugin=Blad podczas uzyskiwania pomocy dla: {0}
+commandNotLoaded=\u00a7cKomenda {0} nie jest zaladowana!
+compassBearing=\u00a77Bearing: {0} ({1} stopni).
+configFileMoveError=Nie udalo sie przeniesc config.yml do lokalizacji backupa.
+configFileRenameError=Nie udalo sie zmienic nazwy tymczasowego pliku na config.yml
+connectedPlayers=Obecni gracze:
+connectionFailed=Blad podczas otwierania polaczenia.
+cooldownWithMessage=\u00a7cCooldown: {0}
+corruptNodeInConfig=\u00a74Notice: Twoj plik konfiguracyjny ma uszkodzony wpis: {0}
+couldNotFindTemplate=Nie mozna znajsc szablonu: {0}
+creatingConfigFromTemplate=tworzenie konfiguracji z szablonu: {0}
+creatingEmptyConfig=Stworzono pusty config: {0}
+creative=Kreatywny
+currency={0}{1}
+currentWorld=Biezacy swiat: {0}
+day=dzien
+days=dnie
+defaultBanReason=Admin ma zawsze racje!
+deleteFileError=Nie mozna usunac pliku: {0}
+deleteHome=\u00a77Posterunek {0} zostal usuniety
+deleteJail=\u00a77Wiezienie {0} zostalo usuniete
+deleteWarp=\u00a77Warp {0} zostal usuniety
+deniedAccessCommand={0} nie ma dostepu do tego polecenia
+dependancyDownloaded=[Essentials] Zaleznosci {0} pobrane prawidlowo.
+dependancyException=[Essentials] Wystapil blad w trakcie pobierania zaleznosci.
+dependancyNotFound=[Essentials] Wymagana zaleznosc nie zostala znaleziona, pobieranie.
+depth=\u00a77Jestes na poziomie morza.
+depthAboveSea=\u00a77Jestes {0} blok(ow) nad poziomem morza.
+depthBelowSea=\u00a77Jestes {0} blok(ow) pod poziomem morza.
+destinationNotSet=Cel nieokreslony.
+disableUnlimited=\u00a77Wylaczone nieograniczone tworzenia {0} dla {1}.
+disabled=wylaczone
+disabledToSpawnMob=Tworzenie tego moba zostalo wylaczone w pliku config.
+dontMoveMessage=\u00a77Teleportacja nastapi za {0}. Prosze sie nie ruszac.
+downloadingGeoIp=Pobieranie bazy danych GeoIP... To moze zajac chwile (wioska: 0.6 MB, miasto: 20MB)
+duplicatedUserdata=Kopiowanie danych uzytkownika: {0} i {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
+enableUnlimited=\u00a77Przyznano nielimitowane zasoby {0} dla {1}.
+enabled=wlaczone
+enchantmentApplied = \u00a77Ulepszenie {0} zostalo przyznane przedmiotowi w twoim reku.
+enchantmentNotFound = \u00a7cUlepszenie nie odnalezione
+enchantmentPerm = \u00a7cNie masz zezwolenia na {0}.
+enchantmentRemoved = \u00a77Ulepszenie {0} zostalo usuniete z przedmiotu w twoim reku..
+enchantments = \u00a77Ulepszenia: {0}
+errorCallingCommand=Blad wywolywania komendy /{0}
+errorWithMessage=\u00a7cBlad: {0}
+essentialsHelp1=Plik jest uszkodzony i Essentials nie moze go otworzyc. Essentials jest teraz wylaczone. Jesli nie mozesz samemu naprawic pliku, idz do adresu http://tiny.cc/EssentialsChat
+essentialsHelp2=Plik jest uszkodzony i Essentials nie moze go otworzyc. Essentials jest teraz wylaczone. Jesli nie mozesz samemu naprawic pliku, wpisz /essentialshelp w grze lub idz do adresu http://tiny.cc/EssentialsChat
+essentialsReload=\u00a77Essentials przeladowalo {0}.
+exp=\u00a7c{0} \u00a77ma\u00a7c {1} \u00a77doswiadczenia (poziom\u00a7c {2}\u00a77), potrzebuje\u00a7c {3} \u00a77wiecej doswiadczenia do nastepnego poziomu.
+expSet=\u00a7c{0} \u00a77teraz ma\u00a7c {1} \u00a77doswiadczenia.
+extinguish=\u00a77Zostales ugaszony.
+extinguishOthers=\u00a77Ugasiles {0}.
+failedToCloseConfig=Blad podczas zamykania configu {0}
+failedToCreateConfig=Blad podczas tworzenia configu {0}
+failedToWriteConfig=Blad podczas pisania configu {0}
+false=\u00a74false\u00a7f
+feed=\u00a77Twoj glod zostal zaspokojony.
+feedOther=\u00a77Nakarmiono {0}.
+fileRenameError=Blad podczas zmiany nazwy pliku \u0093{0}\u0094.
+flyMode=\u00a77Latanie {0} dla {1}.
+flying=flying
+foreverAlone=\u00a7cNie masz komu odpisac.
+freedMemory=Zwolniono {0} MB.
+gameMode=\u00a77Ustawiono tryb gry {0} dla {1}.
+gcchunks= chunki
+gcentities= jednostki
+gcfree=Wolna pamiec: {0} MB
+gcmax=Maksymalna pamiec: {0} MB
+gctotal=Alokowana pamiec: {0} MB
+geoIpUrlEmpty=Url pobierania GeoIP jest puste.
+geoIpUrlInvalid=Url pobierania GeoIP jest nieprawidlowe.
+geoipJoinFormat=Gracz {0} przybyl z {1}
+godDisabledFor=Godmode wylaczony dla {0}.
+godEnabledFor=Godmode wlaczony dla {0}.
+godMode=\u00a77Godmode {0}.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cMusisz cos trzymac w dloni.
+hatPlaced=\u00a7eCiesz sie nowym kapeluszem!
+haveBeenReleased=\u00a77Zostales wypuszczony.
+heal=\u00a77Uleczony
+healOther=\u00a77Uleczono {0}.
+helpConsole=Aby uzyskac pomoc z konsoli, wpisz \u0093????.
+helpFrom=\u00a77Komendy od {0}:
+helpLine=\u00a76/{0}\u00a7f: {1}
+helpMatching=\u00a77Komendy odpowiadajace "{0}":
+helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
+helpPages=Strona \u00a7c{0}\u00a7f z \u00a7c{1}\u00a7f:
+helpPlugin=\u00a74{0}\u00a7f: Plugin Help: /help {1}
+holeInFloor=Kosmos
+homeSet=\u00a77Dom ustawiono
+homeSetToBed=\u00a77Twoj dom znajduje sie teraz w tym lozku.
+homes=Domy: {0}
+hour=godzina
+hours=godziny
+ignorePlayer=Od tej chwili ignorujesz gracza {0}.
+illegalDate=Nie prawidlowy format daty.
+infoChapter=Wybierz rozdzial:
+infoChapterPages=Rozdzial {0}, strona \u00a7c{1}\u00a7f z \u00a7c{2}\u00a7f:
+infoFileDoesNotExist=Plik \u0093info.txt\u0094 nie istnieje. Tworzenie tego pliku.
+infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Strona \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
+infoUnknownChapter=Nieznany rozdzial.
+invBigger=Ekwipunek innego gracza jest wiekszy niz Twoj.
+invRestored=Twoj ekwipunek zostal przywrocony.
+invSee=Widzisz ekwipunek {0}.
+invSeeHelp=Wpisz /invsee aby przywrocic swoj ekwipunek.
+invalidCharge=\u00a7cInvalid charge.
+invalidHome=Dom {0} nie istnieje.
+invalidMob=Niepoprawny typ moba..
+invalidServer=Niepoprawny serwer!
+invalidSignLine=Linia {0} na znaku jest bledna.
+invalidWorld=\u00a7cNieprawidlowy swiat.
+inventoryCleared=\u00a77Ekwipunek oprozniony.
+inventoryClearedOthers=\u00a77Ekwipunek \u00a7c{0}\u00a77 oprozniony.
+is=jest
+itemCannotBeSold=Nie mozesz sprzedac tego przedmiotu do serwera.
+itemMustBeStacked=Przedmiotem handluje sie w stackach. Wielkosc 2s to dwa stacki itd.
+itemNotEnough1=\u00a7cMasz za malo tego przedmiotu, aby go sprzedac.
+itemNotEnough2=\u00a77Jesli chcesz sprzedac wszystkie przedmioty tego typu, wpisz /sell nazwaprzedmiotu
+itemNotEnough3=\u00a77/sell nazwaprzedmiotu -1 sprzeda cala ilosc przedmiotu poza 1 sztuka itd.
+itemSellAir=Serio probujesz sprzedac powietrze? Miej w reku przedmiot..
+itemSold=\u00a77Sprzedamo za \u00a7c{0} \u00a77({1} {2} po {3} kazdy)
+itemSoldConsole={0} Sprzedano {1} za \u00a77{2} \u00a77({3} sztuki po {4} kazda)
+itemSpawn=\u00a77Otrzymywanie {0} {1}
+itemsCsvNotLoaded=Nie mozna wczytac items.csv.
+jailAlreadyIncarcerated=\u00a7cTen gracz jest juz w wiezieniu \u0093{0}\u0094.
+jailMessage=\u00a7cZa kazde przewinienie czeka kara.
+jailNotExist=Nie ma takiego wiezienia..
+jailReleased=\u00a77Gracz \u00a7e{0}\u00a77 wypuszczony z wiezienia.
+jailReleasedPlayerNotify=\u00a77Zostales zwolniony!
+jailSentenceExtended=Czas pobyty w wiezieniu zwiekszony do: {0)
+jailSet=\u00a77Zostalo stworzone wiezienie \u0093{0}\u0094.
+jumpError=To moglo by ci cos zrobic.
+kickDefault=Zostales wyrzucony z serwera.
+kickExempt=\u00a7cNie mozesz wyrzucic tej osoby.
+kickedAll=\u00a7cWyrzucanie wszystki graczy z serwera
+kill=\u00a77Zabito {0}.
+kitError2=\u00a7cTen zestaw nie istnieje lub zostal zle zdefininowany.
+kitError=\u00a7cNie ma prawidlowych zestawow.
+kitErrorHelp=\u00a7cByc moze przedmiotowi brakuje ilosci w konfiguracji?
+kitGive=\u00a77Przydzielanie zestawu {0}.
+kitInvFull=\u00a7cTwoj ekwipuek jest pelen, wyrzucanie zestawu na podloge.
+kitTimed=\u00a7cNie mozesz wziasc tego zestawu przez kolejne {0}.
+kits=\u00a77Zestawy: {0}
+lightningSmited=\u00a77Zostales uderzony piorunem.
+lightningUse=\u00a77Uderzanie piorunem {0}.
+listAfkTag = \u00a77[AFK]\u00a7f
+listAmount = \u00a79Na serwerze jest \u00a7c{0}\u00a79 graczy z maksimum \u00a7c{1}\u00a79 online.
+listAmountHidden = \u00a79There are \u00a7c{0}\u00a77/{1}\u00a79 out of maximum \u00a7c{2}\u00a79 players online.
+listGroupTag={0}\u00a7f:
+listHiddenTag = \u00a77[UKRYTY]\u00a7f
+loadWarpError=Blad przy wczytywaniu Warpu {0}
+localFormat=Lokalny: <{0}> {1}
+mailClear=\u00a7cAby oczyscic skrzynke, wpisz /mail clear
+mailCleared=\u00a77Skrzynka oprozniona!!
+mailSent=\u00a77Wiadomosc wyslana!
+markMailAsRead=\u00a7cAby oczyscic skrzynke, wpisz /mail clear
+markedAsAway=\u00a77Zostales oznaczony jako nieobecny.
+markedAsNotAway=\u00a77Juz nie jestes nieobecny.
+maxHomes=Nie mozesz ustawic wiecej niz {0} domow.
+mayNotJail=\u00a7cNie mozesz wtracic do wiezienia tej osoby.
+me=ja
+minute=minuta
+minutes=minuty
+missingItems=Nie masz {0}x{1}.
+missingPrefixSuffix=Brakuje prefixu lub suffixu dla {0}
+mobSpawnError=Blad podczas zmiany spawnera.
+mobSpawnLimit=Ilosc mobow ograniczona do limitu serwera.
+mobSpawnTarget=Blok musi byc spawnerem.
+mobsAvailable=\u00a77Moby: {0}
+moneyRecievedFrom=\u00a7a{0} otrzymane od {1}
+moneySentTo=\u00a7a{0} zostalo wyslane do {1}
+moneyTaken={0} zostalo zabrane z Twoich funduszy..
+month=miesiac
+months=miesiecy
+moreThanZero=Ilosc musi byc wieksza od 0.
+msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
+muteExempt=\u00a7cNie mozesz wyciszyc tego gracza..
+mutedPlayer=Gracz {0} wyciszony.
+mutedPlayerFor=Gracz {0} wyciszony na {1}.
+mutedUserSpeaks={0} probowal sie odezwac, ale jest wyciszony.
+nearbyPlayers=Gracze w poblizu: {0}
+negativeBalanceError=Gracz nie moze miec ujemnego stanu konta.
+nickChanged=Nick zmieniony.
+nickDisplayName=\u00a77Musisz wlaczyc \u0093change-displayname\u0094 w configu Essential.
+nickInUse=\u00a7cTen pseudonim jest juz w uzyciu.
+nickNamesAlpha=\u00a7cPseudonimy musza byc alfanumeryczne.
+nickNoMore=\u00a77Nie masz juz pseudonimu.
+nickOthersPermission=\u00a7cNie masz uprawnienia do zmiany pseudonimu innym.
+nickSet=\u00a77Twoj pseudonim od teraz to \u00a7c{0}
+noAccessCommand=\u00a7cNie masz dostepu do tej komendy.
+noAccessPermission=\u00a7cNie masz uprawnien do dostepu do {0}.
+noBreakBedrock=Nie masz uprawnien do niszczenia bedrocka.
+noDestroyPermission=\u00a7cNie masz uprawnien do niszczenia {0}.
+noDurability=\u00a7cThis item does not have a durability.
+noGodWorldWarning=\u00a7cUwaga! Godmode wylaczony w tym swiecie!.
+noHelpFound=\u00a7cNie ma odpowiadajacych komend.
+noHomeSet=Nie masz ustawionego domu.
+noHomeSetPlayer=Gracz nie ma ustawionego domu.
+noKitPermission=\u00a7cMusisz posiadac uprawnienia \u00a7c{0}\u00a7c aby uzywac tego zestawu.
+noKits=\u00a77Nie ma jeszcze dostepnych zestawow.
+noMail=Nie masz zadnych wiadomosci.
+noMotd=\u00a7cNie ma wiadomosci dnia..
+noNewMail=\u00a77Nie masz zadnych nowych wiadomosci.
+noPendingRequest=Nie masz oczekuj\u00c3\u00a1cego z\u00c3\u00a1dania.
+noPerm=\u00a7cNie masz uprawnien \u00a7f{0}.
+noPermToSpawnMob=\u00a7cNie masz uprawnien do tworzenia tego moba..
+noPlacePermission=\u00a7cNie masz uprawnien do stawiania bloku kolo tego znaku..
+noPowerTools=Nie masz przypisanego zadnego power tool.
+noRules=\u00a7cNie ustalono jeszcze zadnych zasad.
+noWarpsDefined=Nie ma zadnych warpow.
+none=zaden
+notAllowedToQuestion=\u00a7cNie mozesz zadac tego pytania.
+notAllowedToShout=\u00a7cNie mozesz krzyczec..
+notEnoughExperience=Nie masz wystarczajaco duzo doswiadczenia.
+notEnoughMoney=Nie masz tyle pieniedzy.
+notFlying=not flying
+notRecommendedBukkit= * ! * Wersja Bukkita nie jest rekomendowana wersja dla Essentials.
+notSupportedYet=Jeszcze nie wspierane.
+nothingInHand = \u00a7cNie masz nic w reku..
+now=teraz
+nuke=Niech smierc pochlonie caly swiat!
+numberRequired=Tutaj powinna byc liczba, gluptasie.
+onlyDayNight=/time obsluguje tylko day/night.
+onlyPlayers=Tylko gracze w grze moga uzywac {0}.
+onlySunStorm=/weather obsluguje tylko sun/storm.
+orderBalances=Ordering balances of {0} users, please wait ...
+pTimeCurrent=Czas \u00a7e{0} u00a7f to {1}.
+pTimeCurrentFixed=Czas \u00a7e{0}\u00a7f przywrocony do {1}.
+pTimeNormal=Czas \u00a7e{0}'s\u00a7f jest normalny i odpowiada serwerowemu.
+pTimeOthersPermission=\u00a7cNie masz uprawnien do zmiany czasu innym.
+pTimePlayers=Ci gracze beda miec wlasny czas:
+pTimeReset=Czas gracza zostal zresetowany dla \u00a7e{0}
+pTimeSet=Czas gracza ustawiony na \u00a73{0}\u00a7f dla \u00a7e{1}
+pTimeSetFixed=Czas gracza przywrocony do \u00a73{0}\u00a7f dla \u00a7e{1}
+parseError=Blad skladniowy {0} w linii {1}.
+pendingTeleportCancelled=\u00a7cOczekujace zapytanie teleportacji odrzucone.
+permissionsError=Brakuje Permissions/GroupManager; prefixy/suffixy czatu zostana wylaczone.
+playerBanned=\u00a7c{0} zbanowal {1} za {2}.
+playerInJail=\u00a7cGracz jest juz w wiezieniu \u0093{0}\u0094.
+playerJailed=\u00a77Gracz {0} wtracony do wiezienia.
+playerJailedFor= \u00a77Gracz {0} wtracony do wiezienia na {1}.
+playerKicked=\u00a7c{0} wyrzucil {1} za {2}.
+playerMuted=\u00a77Zostales wyciszony.
+playerMutedFor=\u00a77Zostales wyciszony na {0}.
+playerNeverOnServer=\u00a7cGracz {0} nigdy nie byl na tym serwerze.
+playerNotFound=\u00a7cNie odnaleziono gracza.
+playerUnmuted=\u00a77Zostales przywrocony do glosu.
+pong=Pong!
+possibleWorlds=\u00a77Mozliwe swiaty maja numery od 0 do {0}.
+powerToolAir=Nie zartuj, chcesz przypisac polecenie do powietrza?
+powerToolAlreadySet=Polecenie \u00a7c{0}\u00a7f jest juz przypisane do {1}.
+powerToolAttach=\u00a7c{0}\u00a7f polecenie przypisane do {1}.
+powerToolClearAll=Wszystkie przypisane polecenia zostaly usuniete!
+powerToolList={1} zawiera nastepujace polecenia: \u00a7c{0}\u00a7f.
+powerToolListEmpty={0} nie ma przypisanych polecen.
+powerToolNoSuchCommandAssigned=Polecenie \u00a7c{0}\u00a7f nie moze byc przypisane do {1}.
+powerToolRemove=Polecenie \u00a7c{0}\u00a7f usuniete z {1}.
+powerToolRemoveAll=Wszystkie polecenia zostaly usuniete z {0}.
+powerToolsDisabled=Wszystkie twoje podpiecia zostaly zdezaktywowane.
+powerToolsEnabled=Wszystkie twoje podpiecia zostaly aktywowane.
+protectionOwner=\u00a76[EssentialsProtect] Wlasciciel zabezpieczen: {0}
+questionFormat=\u00a77[Question]\u00a7f {0}
+readNextPage=Wpisz /{0} {1} aby przeczytac nastepna strone
+reloadAllPlugins=\u00a77Przeladowano wszystkie wtyczki
+removed=\u00a77Usunieto {0} byty.
+repair=Udalo sie naprawic twoj: \u00a7e{0}.
+repairAlreadyFixed=\u00a77Ten przedmiot nie potrzebuje naprawy
+repairEnchanted=\u00a77Nie masz zezwolenia do naprawiania ulepszonych przedmiotow.
+repairInvalidType=\u00a7cTen przedmiot nie moze byc naprawiony.
+repairNone=Zaden przedmiot nie wymagal naprawy.
+requestAccepted=\u00a77Zadanie teleportacji - zaakceptowano.
+requestAcceptedFrom=\u00a77{0} zaakceptowal Twoje z\u00c3\u00a1danie teleportacji.
+requestDenied=\u00a77Zadanie teleportacji - odrzucone.
+requestDeniedFrom=\u00a77{0} odrzucil Twoje z\u00c3\u00a1danie teleportacji.
+requestSent=\u00a77zZ\u00c3\u00a1danie wyslania do {0}\u00a77.
+requestTimedOut=\u00a7cZ\u00c3\u00a1danie teleportacji - przedawnione.
+requiredBukkit= * ! * Potrzebujesz najnowszego {0} CraftBukkit-a, pobierz go z http://dl.bukkit.org/downloads/craftbukkit/
+returnPlayerToJailError=Wystapil blad podczas powrotu gracza {0} do wiezienia: {1}
+second=sekunda
+seconds=sekund
+seenOffline=Gracz {0} jest offline od {1}
+seenOnline=Gracz {0} jest online od {1}
+serverFull=Serwer jest pelen graczy, sprobuj pozniej.
+serverTotal=Podsumowanie serwera: {0}
+setSpawner=Ustawiono spawn na {0}.
+sheepMalformedColor=Niewlasciwa barwa.
+shoutFormat=\u00a77[Shout]\u00a7f {0}
+signFormatFail=\u00a74[{0}]
+signFormatSuccess=\u00a71[{0}]
+signFormatTemplate=[{0}]
+signProtectInvalidLocation=\u00a74Nie masz zezwolenia do tworzenia tutaj znakow.
+similarWarpExist=Warp o tej nazwie juz istnieje.
+slimeMalformedSize=Niewlasciwy rozmiar.
+soloMob=Ten mob lubi byc sam.
+spawnSet=\u00a77Ustawiono punkt spawnu dla grupy {0}.
+spawned=stworzono
+sudoExempt=Nie mozesz podniesc uprawnien tego uzytkownika.
+sudoRun=Probuje {0} uruchomic: /{1} {2}
+suicideMessage=\u00a77Zegnaj okrutny swiecie.
+suicideSuccess= \u00a77{0} dokonal zamachu na swoje zycie
+survival=survival
+takenFromAccount=\u00a7c{0} zostalo pobrane z konta.
+takenFromOthersAccount=\u00a7c{0} zostalo pobrane z {1}\u00a7c konta. Nowy stan konta: {2}
+teleportAAll=\u00a77Zadanie teleportacji - wyslano do wszystkich graczy.
+teleportAll=\u00a77Teleportowanie wszystkich graczy.
+teleportAtoB=\u00a77{0}\u00a77 przeteleportowal Ciebie do {1}\u00a77.
+teleportDisabled={0} ma zdezaktywowana teleportacje.
+teleportHereRequest=\u00a7c{0}\u00a7c ma zadanie przeteleportowac cie do nich.
+teleportNewPlayerError=Blad przy teleportowniu nowego gracza.
+teleportRequest=\u00a7c{0}\u00a7c zazadal teleportacji do Ciebie.
+teleportRequestTimeoutInfo=\u00a77 Zadanie teleportacji przedawni sie za {0} sekund.
+teleportTop=\u00a77Teleportacja na wierzch.
+teleportationCommencing=\u00a77Teleport rozgrzewa sie...
+teleportationDisabled=\u00a77Teleportacja - zdezaktywowana.
+teleportationEnabled=\u00a77Teleportacja - aktywowana.
+teleporting=\u00a77Teleportacja...
+teleportingPortal=\u00a77Teleportacja przez portal.
+tempBanned=Tymczasowo zbanowany na serwerze przez {0}.
+tempbanExempt=\u00a77Nie mozesz tymczasowo zbanowac tego gracza.
+thunder= {0} przywowlal burze.
+thunderDuration={0} przywolal burze na {1} sekund.
+timeBeforeHeal=Czas przed nastepnym uzdrowieniem: {0}.
+timeBeforeTeleport=Czas przed nastepnym teleportem:{0}.
+timeFormat=\u00a73{0}\u00a7f or \u00a73{1}\u00a7f or \u00a73{2}\u00a7f
+timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
+timeSet=Czas ustawiono we wszystkich swiatach.
+timeSetPermission=\u00a7cNie masz uprawnien do ustawiania czasu.
+timeWorldCurrent=Obecny czas {0} to \u00a73{1}.
+timeWorldSet=Czas ustawiono {0} w: \u00a7c{1}.
+tps=Current TPS = {0}
+tradeCompleted=\u00a77Handel zakonczono.
+tradeSignEmpty=Tabliczka handlowa nie jest dostepna dla Ciebie.
+tradeSignEmptyOwner=Nie ma nic do pobrania z tej tabliczki.
+treeFailure=\u00a7cUtworzenie drzewa nie powiodlo sie, sprobuj na trawie lub ziemi.
+treeSpawned=\u00a77Drzewo utworzono.
+true=\u00a72true\u00a7f
+typeTpaccept=\u00a77Aby zaakceptowac teleport, wpisz \u00a7c/tpaccept\u00a77.
+typeTpdeny=\u00a77Aby odmowic teleportacji, wpisz \u00a7c/tpdeny\u00a77.
+typeWorldName=\u00a77Mozesz rowniez wpisac nazwe danego swiata.
+unableToSpawnMob=Nie udalo sie stworzyc potwora.
+unbannedIP=Odbanowana gracza o danym adresie IP.
+unbannedPlayer=Odbanowano gracza.
+unignorePlayer=Nie ignorujesz juz gracza {0}.
+unknownItemId=Nieznane id przedmiotu: {0}.
+unknownItemInList=Nieznany przedmiot {0} w liscie {1} .
+unknownItemName=Nieznana nazwa przedmiotu: {0}.
+unlimitedItemPermission=\u00a7cBrak uprawnien dla nielimitowanego przedmiotu {0}.
+unlimitedItems=Nielimitowane przedmioty:
+unmutedPlayer=Gracz {0} moze znowu mowic.
+unvanished=\u00a7aZn\u00c3\u00b3w jestes widoczny.
+unvanishedReload=\u00a7cReload spowodowal ze cie widac.
+upgradingFilesError=Wystapil blad podczas aktualizowaniu plik\u00c3\u00b3w.
+userDoesNotExist=Uzytkownik {0} nie istnieje w bazie danych.
+userIsAway={0} jest teraz AFK.
+userIsNotAway={0} nie jest juz AFK.
+userJailed=\u00a77Zostales zamkniety w wiezieniu.
+userUsedPortal={0} uzyl istniejacego portalu wyjscia.
+userdataMoveBackError=Nie udalo sie przeniesc userdata/{0}.tmp do userdata/{1}
+userdataMoveError=Nie udalo sie przeniesc userdata/{0} do userdata/{1}.tmp
+usingTempFolderForTesting=Uzywam tymczasowego folderu dla testu:
+vanished=\u00a7aJuz jestes niewidoczny.
+versionMismatch=Niepoprawna wersja! Prosze zaktualizowac {0} do tej samej wersji co inne pliki.
+versionMismatchAll=Niepoprawna wersja! Prosze zaktualizowac wszystkie pliki Essentials do tej samej wersji.
+voiceSilenced=\u00a77Twe usta zostaly zaszyte.
+warpDeleteError=Wystapil problem podczas usuwania pliku z Warpami.
+warpListPermission=\u00a7cNie masz pozwolenia na sprawdzenie listy Warp\u00c3\u00b3w..
+warpNotExist=Ten Warp nie istnieje.
+warpOverwrite=\u00a7cNie mozesz nadpisac tego Warpa.
+warpSet=\u00a77Warp {0} stworzony.
+warpUsePermission=\u00a7cNie masz pozwolenie na korzystanie z tego Warpa.
+warpingTo=\u00a77Teleportuje do {0}.
+warps=Warpy: {0}
+warpsCount=\u00a77Istnieje {0} warp\u00c3\u00b3w. Pokazuje strone {1} z {2}.
+weatherStorm=\u00a77Ustawiles burze w {0}.
+weatherStormFor=\u00a77Ustawiles burze w {0} na {1} sekund.
+weatherSun=\u00a77Ustawiles bezchmurna pogode w {0}.
+weatherSunFor=\u00a77Ustawiles bezchmurna pogode w {0} na {1} sekund.
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Zbanowany:\u00a7f {0}.
+whoisExp=\u00a76 - Punkty Doswiadczenia:\u00a7f {0} (Poziom {1}).
+whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Tryb Gry:\u00a7f {0}.
+whoisGeoLocation=\u00a76 - Lokalizacja:\u00a7f {0}.
+whoisGod=\u00a76 - Godmode:\u00a7f {0}.
+whoisHealth=\u00a76 - Zdrowie:\u00a7f {0}/20.
+whoisIPAddress=\u00a76 - Adres IP:\u00a7f {0}.
+whoisJail=\u00a76 - W wiezieniu:\u00a7f {0}.
+whoisLocation=\u00a76 - Lokalizacja:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Pieniadze:\u00a7f {0}.
+whoisMuted=\u00a76 - Muted:\u00a7f {0}
+whoisNick=\u00a76 - Nick:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+worth=\u00a77Stack {0} jest warty \u00a7c{1}\u00a77 ({2}rzedmiot(y) po {3} kazdy)
+worthMeta=\u00a77Stack {0} z metadata {1} jest warty \u00a7c{2}\u00a77 ({3} przedmiot(y) po {4} kazdy)
+worthSet=Cena przedmiotu ustawiona.
+year=rok
+years=lat
+youAreHealed=\u00a77Zostales/as uleczony/na.
+youHaveNewMail=\u00a7cMasz {0} wiadomosci!\u00a7f napisz \u00a77/mail read\u00a7f aby je przeczytac.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
new file mode 100644
index 000000000..332395ed2
--- /dev/null
+++ b/Essentials/src/messages_pt.properties
@@ -0,0 +1,444 @@
+#version: TeamCity
+# Single quotes have to be doubled: ''
+# Translations start here
+# by: FurmigaHumana, completed by Iaccidentally
+action=* {0} {1}
+addedToAccount=\u00a7a{0} foi adicionado a sua conta.
+addedToOthersAccount=\u00a7a{0} adicionado a {1}\u00a7a saldo. Novo saldo: {2}
+alertBroke=Quebrou:
+alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} em: {3}
+alertPlaced=Colocou:
+alertUsed=Usou:
+autoAfkKickReason=Voc\u00ea foi kickado por estar inativo a mais de {0} minutos.
+backAfterDeath=\u00a77Use o comando /back para voltar onde morreu.
+backUsageMsg=\u00a77Retornando a posi\u00e7ao anterior...
+backupDisabled=Um script de backup externo nao foi configurado.
+backupFinished=Backup conclu\u00eddo
+backupStarted=Backup iniciado
+balance=\u00a77Saldo: {0}
+balanceTop=\u00a77 Saldos superiores ({0})
+banExempt=\u00a7cVoc\u00ea nao pode banir este jogador.
+banIpAddress=\u00a77Endere\u00e7o de IP banido
+bannedIpsFileError=Erro ao ler o arquivo banned-ips.txt
+bannedIpsFileNotFound=banned-ips.txt nao encontrado
+bannedPlayersFileError=Erro ao ler o arquivo banned-players.txt
+bannedPlayersFileNotFound=banned-players.txt nao encontrado
+bigTreeFailure=\u00a7cFalha na gera\u00e7ao da \u00e1rvore grande. Tente de novo na terra ou grama.
+bigTreeSuccess= \u00a77\u00c1rvore grande gerada.
+blockList=Essentials passou o seguinte comando a outro plugin:
+broadcast=[\u00a7cBroadcast\u00a7f]\u00a7a {0}
+buildAlert=\u00a7cVoc\u00ea nao tem permissao de construir.
+bukkitFormatChanged=Bukkit: formato da versao alterada. Versao nao verificada.
+burnMsg=\u00a77Voc\u00ea {0} foi incendiado por {1} segundos.
+canTalkAgain=\u00a77Voc\u00ea pode falar de novo
+cantFindGeoIpDB=Nao foi poss\u00edvel encontrar o GeoIP database!
+cantReadGeoIpDB=Falhou em ler a GeoIP database!
+cantSpawnItem=\u00a7cVoc\u00ea nao tem permissao de pegar este item {0}
+chatTypeLocal=[L]
+chatTypeAdmin=[A]
+chatTypeSpy=[Spy]
+commandFailed=Comando {0} falhou:
+commandHelpFailedForPlugin=Erro ao obter ajuda para: {0}
+commandNotLoaded=\u00a7cCommando {0} provavelmente esta carregado.
+compassBearing=\u00a77Inclina\u00e7ao: {0} ({1} graus).
+configFileMoveError=Falha ao mover arquivo config.yml ao local de backup.
+configFileRenameError=Falha em renomear arquivo temporario em config.yml
+connectedPlayers=Jogadores conectados:
+connectionFailed=Falha ao abrir conexao.
+cooldownWithMessage=\u00a7cTempo de espera: {0}
+corruptNodeInConfig=\u00a74Aviso: Seu arquivo de configura\u00e7ao tem uma parte {0} corrompida.
+couldNotFindTemplate=Nao foi poss\u00edvel encontrar o modelo {0}
+creatingConfigFromTemplate=Criando arquivo de configura\u00e7ao com o modelo: {0}
+creatingEmptyConfig=Criando arquivo de configura\u00e7ao vazio: {0}
+creative=creative
+currency={0}{1}
+currentWorld=Current World: {0}
+day=dia
+days=dias
+defaultBanReason=O martelo proibicao falou!
+deleteFileError=Nao \u00e9 poss\u00edvel deletar arquivo: {0}
+deleteHome=\u00a77Casa {0} foi removida.
+deleteJail=\u00a77prisao {0} foi removida.
+deleteWarp=\u00a77Warp {0} foi removido.
+deniedAccessCommand={0} Acesso negado ao comando.
+dependancyDownloaded=[Essentials] Dependencia {0} baixada com sucesso.
+dependancyException=[Essentials] Ocorreu um erro ao tentar baixar uma dependencia
+dependancyNotFound=[Essentials] Uma dependencia necess\u00e1ria nao foi encontrada. Baixando agora.
+depth=\u00a77Voc\u00ea esta no nivel do mar.
+depthAboveSea=\u00a77Voc\u00ea esta a {0} bloco(s) acima do nivel do mar.
+depthBelowSea=\u00a77Voc\u00ea esta a {0} bloco(s) abaixo do nivel do mar.
+destinationNotSet=Destino nao definido.
+disableUnlimited=\u00a77Desativada itens ilimitados de {0} para {1}.
+disabled=desativado
+disabledToSpawnMob=Desovar este mob esta desativado nas configura\u00e7\u00f5es.
+dontMoveMessage=\u00a77Teleporte vai come\u00e7ar em {0}. Nao se mova.
+downloadingGeoIp=Baixando GeoIP database ... pode demorar um pouco (Pais: 0.6 MB, Cidade: 20MB)
+duplicatedUserdata=Dado de usu\u00e1rio duplicado: {0} e {1}
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
+enableUnlimited=\u00a77Colocando quantidade ilimitada de {0} para {1}.
+enabled=ativado
+enchantmentApplied = \u00a77O encantamento {0} foi aplicado ao item na sua mao.
+enchantmentNotFound = \u00a7cEncantamento nao encontrado.
+enchantmentPerm = \u00a7cVoc\u00ea nao tem permissao para {0}
+enchantmentRemoved = \u00a77O encantamento {0} foi removido do item na sua mao.
+enchantments = \u00a77Encantamentos: {0}
+errorCallingCommand=Erro no comando /{0}
+errorWithMessage=\u00a7cErro: {0}
+essentialsHelp1=O arquivo esta quebrado e o essentials nao consegue abrilo. Essentials esta desativado agora. Se voc\u00ea nao consegue arrumar o arquivo, va para http://tiny.cc/EssentialsChat
+essentialsHelp2=O arquivo esta quebrado e o essentials nao consegue abrilo. Essentials esta desativado agora. Se voc\u00ea nao consegue arrumar o arquivo, tente digitar /essentialshelp no jogo ou va para http://tiny.cc/EssentialsChat
+essentialsReload=\u00a77Essentials recarregado {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
+extinguish=\u00a77Voce se extinguiu.
+extinguishOthers=\u00a77Voce foi extinguido {0}.
+failedToCloseConfig=Falha em fechar o arquivo de configura\u00e7ao {0}
+failedToCreateConfig=Falha em criar o arquivo de configura\u00e7ao {0}
+failedToWriteConfig=Falha em escrever no arquivo de configura\u00e7ao {0}
+false=\u00a74false\u00a7f
+feed=\u00a77Seu apetite foi saciado.
+feedOther=\u00a77Satisfeito {0}.
+fileRenameError=Falha ao renomear o arquivo {0}.
+flyMode=\u00a77Definir o modo de voar {0} para {1}.
+flying=flying
+foreverAlone=\u00a7cVoc\u00ea nao tem ninguem a quem responder.
+freedMemory=Livre {0} MB.
+gameMode=\u00a77Gamemode {0} definido para {1}.
+gcchunks= chunks,
+gcentities= entidades
+gcfree=Memoria livre: {0} MB
+gcmax=Mem\u00f3ria Maxima: {0} MB
+gctotal=Mem\u00f3ria alocada: {0} MB
+geoIpUrlEmpty=GeoIP url de download esta vazia.
+geoIpUrlInvalid=GeoIP url de download e invalida.
+geoipJoinFormat=Jogador {0} veio do {1}
+godDisabledFor=desativado para {0}
+godEnabledFor=ativado para {0}
+godMode=\u00a77Modo Deus {0}.
+hatArmor=\u00a7cDe erro, voce nao pode usar este item como um chapeu!
+hatEmpty=\u00a7cYou are not wearing a hat.
+hatFail=\u00a7cVoce deve ter algo para vestir na sua mao.
+hatPlaced=\u00a7eAproveite o seu novo chapeu!
+haveBeenReleased=\u00a77Voc\u00ea foi liberado.
+heal=\u00a77Voc\u00ea foi curado.
+healOther=\u00a77Curado {0}.
+helpConsole=Para ver ajuda do console, digite ?.
+helpFrom=\u00a77Comandos a partir de {0}:
+helpLine=\u00a76/{0}\u00a7f: {1}
+helpMatching=\u00a77Comandos correspondentes "{0}":
+helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
+helpPages=P\u00e1gina \u00a7c{0}\u00a7f of \u00a7c{1}\u00a7f:
+helpPlugin=\u00a74{0}\u00a7f: Ajuda Plugin: /help {1}
+holeInFloor=Buraco no chao
+homeSet=\u00a77Casa definida.
+homeSetToBed=\u00a77Sua casa agora esta definida a esta cama.
+homes=Casa: {0}
+hour=hora
+hours=horas
+ignorePlayer=Voc\u00ea esta ignorando o jogador {0} agora.
+illegalDate=Formato de data \u00edlegal.
+infoChapter=Selecione o cap\u00edtulo:
+infoChapterPages=Cap\u00edtulo {0}, pagina \u00a7c{1}\u00a7f de \u00a7c{2}\u00a7f:
+infoFileDoesNotExist=Arquivo info.txt nao existe. Criando um para voc\u00ea.
+infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Page \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
+infoUnknownChapter=Cap\u00edtulo desconhecido.
+invBigger=O invent\u00e1rio do outro usu\u00e1rio e maior que o seu.
+invRestored=Seu invent\u00e1rio foi restaurado.
+invSee=Voc\u00ea v\u00ea o invent\u00e1rio de {0}.
+invSeeHelp=Use /invsee para voltar ao seu invent\u00e1rio.
+invalidCharge=\u00a7cCarga invalida.
+invalidHome=Home {0} nao existe
+invalidMob=Tipo de mob inv\u00e1lido.
+invalidServer=Servidor inv\u00e1lido!
+invalidSignLine=Linha {0} da placa e inv\u00e1lida.
+invalidWorld=\u00a7cMundo inv\u00e1lido.
+inventoryCleared=\u00a77Invent\u00e1rio limpo.
+inventoryClearedOthers=\u00a77Invent\u00e1rio de \u00a7c{0}\u00a77 limpo.
+is=\u00e9
+itemCannotBeSold=Este item nao pode ser vendido para o servidor.
+itemMustBeStacked=O item deve ser negociado em pacotes. A qantidade de 2s seria dois pacotes, etc.
+itemNotEnough1=\u00a7cVoc\u00ea nao tem esta quantidade de itens para vender.
+itemNotEnough2=\u00a77Se voc\u00ea quer vender todos os itens deste tipo, use /sell NomeDoItem
+itemNotEnough3=\u00a77/sell NomeDoItem -1 vai vender tudo mais um item, etc.
+itemSellAir=Voc\u00ea realmente tentou vender ar? Coloque um item na sua mao.
+itemSold=\u00a77Vendido para \u00a7c{0} \u00a77({1} {2} a {3} cada)
+itemSoldConsole={0} vendido {1} para \u00a77{2} \u00a77({3} itens a {4} cada)
+itemSpawn=\u00a77Dando {0} de {1}
+itemsCsvNotLoaded=nao foi poss\u00edvel carregar items.csv.
+jailAlreadyIncarcerated=\u00a7cEsta pessoa j\u00e1 esta na cadeia: {0}
+jailMessage=\u00a7cVoc\u00ea faz o crime, voc\u00ea cumpre a pena.
+jailNotExist=esta cadeia nao existe.
+jailReleased=\u00a77Player \u00a7e{0}\u00a77 libertado.
+jailReleasedPlayerNotify=\u00a77Voc\u00ea foi solto!
+jailSentenceExtended=Tempo de prisao estendido para: {0)
+jailSet=\u00a77Cela {0} foi definida
+jumpError=Isso prejudica o c\u00e9rebro do seu computador.
+kickDefault=Kickado do servidor.
+kickExempt=\u00a7cVoc\u00ea nao pode kickar esta pessoa.
+kickedAll=\u00a7cKicked all players from server
+kill=\u00a77Assassinado {0}.
+kitError2=\u00a7cEsse kit nao existe ou foi definido impropiamente.
+kitError=\u00a7cNao existe kits v\u00e1lidos.
+kitErrorHelp=\u00a7cTalvez um item esta faltando a quantidade nas configura\u00e7\u00f5es?
+kitGive=\u00a77Dando kit {0}.
+kitInvFull=\u00a7cSeu invent\u00e1rio esta cheio, colocando kit no chao
+kitTimed=\u00a7cVoc\u00ea nao pode usar este kit denovo por {0}.
+kits=\u00a77Kits: {0}
+lightningSmited=\u00a77YVoc\u00ea acaba de ser castigado
+lightningUse=\u00a77Castigando {0}
+listAfkTag = \u00a77[Ausente]\u00a7f
+listAmount = \u00a79Aqui tem \u00a7c{0}\u00a79 do m\u00e1ximo de \u00a7c{1}\u00a79 jogadores online.
+listAmountHidden = \u00a79Aqui tem \u00a7c{0}\u00a77/{1}\u00a79 do maximo de \u00a7c{2}\u00a79 jogadores online.
+listGroupTag={0}\u00a7f:
+listHiddenTag = \u00a77[ESCONDIDO]\u00a7f
+loadWarpError=Falha ao carregar warp {0}
+localFormat=Local: <{0}> {1}
+mailClear=\u00a7cPara marcar seu email como lido, use /mail clear
+mailCleared=\u00a77eMail limpo!
+mailSent=\u00a77eMail enviado!
+markMailAsRead=\u00a7cPara marcar seu email como lido, use /mail clear
+markedAsAway=\u00a77[AFK] Agora voc\u00ea esta marcado como aus\u00eante.
+markedAsNotAway=\u00a77[AFK] Voc\u00ea nao esta mais marcado como aus\u00eante.
+maxHomes=Voc\u00ea nao pode definir mais de {0} casas.
+mayNotJail=\u00a7cVoc\u00ea nao pode prender esta pessoa
+me=eu
+minute=minuto
+minutes=minutos
+missingItems=Voc\u00ea nao tem {0}x {1}.
+missingPrefixSuffix=Faltando um prefixo ou sufixo para {0}
+mobSpawnError=Erro ao mudar o mob spawner.
+mobSpawnLimit=Quantidade de mob limitada pelo servidor
+mobSpawnTarget=Bloco de destino deve ser um mob spawner.
+mobsAvailable=\u00a77Mobs: {0}
+moneyRecievedFrom=\u00a7a{0} foi recebido de {1}
+moneySentTo=\u00a7a{0} foi enviado para {1}
+moneyTaken={0} tirado da sua conta.
+month=m\u00eas
+months=meses
+moreThanZero=Quantidade deve ser maior que 0.
+msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
+muteExempt=\u00a7cVoc\u00ea nao pode mutar este jogador.
+mutedPlayer=Player {0} mutado.
+mutedPlayerFor=Player {0} mutado por {1}.
+mutedUserSpeaks={0} tentou falar, mas esta mutado.
+nearbyPlayers=Jogadores por perto: {0}
+negativeBalanceError=Nao \u00e9 permitido ter um saldo negativo.
+nickChanged=Apelido modificado.
+nickDisplayName=\u00a77Voc\u00ea deve ativar change-displayname nas configura\u00e7\u00f5es do Essentials.
+nickInUse=\u00a7cEste nome j\u00e1 esta em uso.
+nickNamesAlpha=\u00a7cApelidos devem ser alfanumericos.
+nickNoMore=\u00a77Voc\u00ea nao tem mais um apelido.
+nickOthersPermission=\u00a7cVoc\u00ea nao tem permissao para mudar o apelido dos outros.
+nickSet=\u00a77Agora seu apelido \u00e9 \u00a7c{0}
+noAccessCommand=\u00a7cVoc\u00ea nao tem acesso a este comando.
+noAccessPermission=\u00a7cVoc\u00ea nao tem permissao para acessar isso {0}.
+noBreakBedrock=Voce nao tem permissao para destruir bedrock.
+noDestroyPermission=\u00a7cVoc\u00ea nao tem permissao para destruir isso {0}.
+noDurability=\u00a7cThis item does not have a durability.
+noGodWorldWarning=\u00a7cAviso! Modo Deus neste mundo esta desativado.
+noHelpFound=\u00a7cNenhum comando correspondente.
+noHomeSet=Voc\u00ea nao definiu nenhuma casa.
+noHomeSetPlayer=Jogador nao definiu nenhuma casa.
+noKitPermission=\u00a7cVoc\u00ea precisa da permissao \u00a7c{0}\u00a7c para usar este kit.
+noKits=\u00a77Ainda nao tem nenhum item disponivel
+noMail=Voc\u00ea nao tem nenhum email
+noMotd=\u00a7cNao h\u00e1 nenhuma mensagem do dia.
+noNewMail=\u00a77Voc\u00ea nao tem nenhum novo email.
+noPendingRequest=Voc\u00ea nao tem um pedido pendente.
+noPerm=\u00a7cVoc\u00ea nao tem a permissao \u00a7f{0}\u00a7c.
+noPermToSpawnMob=\u00a7cVoc\u00ea nao tem permissao para desovar este mob.
+noPlacePermission=\u00a7cVoc\u00ea nao tem permissao de por um bloco perto daquela placa.
+noPowerTools=Voc\u00ea nao tem nenhuma super ferramenta definida.
+noRules=\u00a7cAinda nao foi definida as regras.
+noWarpsDefined=Nenhum warp definido
+none=nenhum
+notAllowedToQuestion=\u00a7cVoc\u00ea nao esta autorizado a usar pergunta.
+notAllowedToShout=\u00a7cVoc\u00ea nao esta autorizado a gritar.
+notEnoughExperience=Voc\u00ea nao tem experiencia suficiente.
+notEnoughMoney=Voc\u00ea nao tem dinheiro suficiente.
+notFlying=not flying
+notRecommendedBukkit=* ! * Versao do bukkit nao \u00e9 a recomendada para o essentials.
+notSupportedYet=Ainda nao suportado.
+nothingInHand = \u00a7cVoc\u00ea nao tem nada em sua mao.
+now=agora
+nuke=Pode chover a morte sobre eles
+numberRequired=Um numero vai aqui, bobinho.
+onlyDayNight=/time apenas suporta day/night.
+onlyPlayers=Apenas jogadores no jogo pode usar {0}.
+onlySunStorm=/weather apenas suporta sun/storm.
+orderBalances=Ordenando saldos de {0} usuarios, aguarde ...
+pTimeCurrent=\u00a7e{0}''s\u00a7f horario e {1}.
+pTimeCurrentFixed=\u00a7e{0}''s\u00a7f hor\u00e1rio foi fixado para {1}.
+pTimeNormal=\u00a7e{0}''s\u00a7f o tempo esta normal e sincronisado com o servidor.
+pTimeOthersPermission=\u00a7cVoc\u00ea nao esta autorisado para definir o tempo dos outros jogadores.
+pTimePlayers=Estes jogadores tem seus propios hor\u00e1rios:
+pTimeReset=Hor\u00e1rio do jogador foi recetado para: \u00a7e{0}
+pTimeSet=Hor\u00e1rio do jogador foi definido para \u00a73{0}\u00a7f por: \u00a7e{1}
+pTimeSetFixed=Hor\u00e1rio do jogador foi fixado para \u00a73{0}\u00a7f por: \u00a7e{1}
+parseError=Analise de erro {0} na linha {1}
+pendingTeleportCancelled=\u00a7cPedido de teleporte pendente cancelado.
+permissionsError=Faltando Permissions/GroupManager; chat prefixos/sufixos serao desativados.
+playerBanned=\u00a7cJogador {0} banido {1} por {2}
+playerInJail=\u00a7cJogador j\u00e1 esta na cadeia {0}.
+playerJailed=\u00a77Jogador {0} preso.
+playerJailedFor= \u00a77Player {0} condenado por {1}.
+playerKicked=\u00a7cPlayer {0} kickado {1} por {2}
+playerMuted=\u00a77Voce foi desmutado
+playerMutedFor=\u00a77Voce foi mutado por {0}
+playerNeverOnServer=\u00a7cJogador {0} nunca esteve no servidor.
+playerNotFound=\u00a7cJogador nao encontrado.
+playerUnmuted=\u00a77Foi desmutado
+pong=Pong!
+possibleWorlds=\u00a77Mundos poss\u00edveis sao 0 at\u00e9 {0}.
+powerToolAir=Comando nao pode ser definido para o ar.
+powerToolAlreadySet=Comando \u00a7c{0}\u00a7f j\u00e1 esta definido para {1}.
+powerToolAttach=\u00a7c{0}\u00a7f comando definido para {1}.
+powerToolClearAll=Todas superferramentas foram limpas.
+powerToolList={1} tem os seguintes comandos: \u00a7c{0}\u00a7f.
+powerToolListEmpty={0} nenhum comando definido.
+powerToolNoSuchCommandAssigned=Comando \u00a7c{0}\u00a7f nao foi definido para {1}.
+powerToolRemove=Comando \u00a7c{0}\u00a7f removido do {1}.
+powerToolRemoveAll=Todos comandos removidos do {0}.
+powerToolsDisabled=Todas suas super ferramentas foram habilitadas.
+powerToolsEnabled=Todas suas super ferramentas foram desabilitadas.
+protectionOwner=\u00a76[EssentialsProtect] Dono da prote\u00e7ao: {0}
+questionFormat=\u00a77[Pergunta]\u00a7f {0}
+readNextPage=Digite /{0} {1} para ler a pr\u00f3xima p\u00e1gina
+reloadAllPlugins=\u00a77Todos plugins recarregados.
+removed=\u00a77Removido {0} entidades.
+repair=Voc\u00ea reparou com sucesso sua: \u00a7e{0}.
+repairAlreadyFixed=\u00a77Esse item nao precisa ser reparado.
+repairEnchanted=\u00a77Voc\u00ea nao pode reparar itens encantados.
+repairInvalidType=\u00a7cEsse item nao pode ser reparado.
+repairNone=Nao ha itens que precisam ser reparados.
+requestAccepted=\u00a77Pedido de teleporte aceito.
+requestAcceptedFrom=\u00a77{0} aceitou seu pedido de teleporte.
+requestDenied=\u00a77Pedido de teleporte recusado.
+requestDeniedFrom=\u00a77{0} recusou seu pedido de teleporte
+requestSent=\u00a77Pedindo enviado para {0}\u00a77.
+requestTimedOut=\u00a7cPedido de teleporte passou o limite de tempo
+requiredBukkit=* ! * Voc\u00ea precisa da ultima build {0} do CraftBukkit, baixa ela em http://dl.bukkit.org/downloads/craftbukkit/
+returnPlayerToJailError=Erro ocorreu ao tentar retornar jogador {0} para a cadeia: {1}
+second=segundo
+seconds=segundos
+seenOffline=Jogador {0} esta offline desde {1}
+seenOnline=Jogador {0} esta online desde {1}
+serverFull=O servidor esta cheio
+serverTotal=Server Total: {0}
+setSpawner=Spawner modificado para {0}
+sheepMalformedColor=Cor malformada.
+shoutFormat=\u00a77[GRITAR]\u00a7f {0}
+signFormatFail=\u00a74[{0}]
+signFormatSuccess=\u00a71[{0}]
+signFormatTemplate=[{0}]
+signProtectInvalidLocation=\u00a74Voc\u00ea nao pode criar placas aqui.
+similarWarpExist=Um warp com um nome parecido j\u00e1 existe.
+slimeMalformedSize=Tamanho malformado.
+soloMob=Este mob gosta de ficar sozinho
+spawnSet=\u00a77Ponto de spawn definido para o grupo {0}.
+spawned=desovado
+sudoExempt=voce nao pode sudo este usuario
+sudoRun=Forcing {0} to run: /{1} {2}
+suicideMessage=\u00a77Adeus mundo cruel...
+suicideSuccess= \u00a77{0} tirou sua propia vida
+survival=survival
+takenFromAccount=\u00a7c{0} foi tirado da sua conta.
+takenFromOthersAccount=\u00a7c{0} tirado de {1}\u00a7c conta. Novo saldo: {2}
+teleportAAll=\u00a77Pedido de teleporte enviado a todos os jogadores...
+teleportAll=\u00a77Teleportando todos os jogadores...
+teleportAtoB=\u00a77{0}\u00a77 teleportou voc\u00ea para {1}\u00a77.
+teleportDisabled={0} tem o teleporte desativado.
+teleportHereRequest=\u00a7c{0}\u00a7c solicitou que voc\u00ea se teleporte para ele.
+teleportNewPlayerError=Falha para teleportar novo jogador
+teleportRequest=\u00a7c{0}\u00a7c solicitou para se teleportar at\u00e9 voc\u00ea.
+teleportRequestTimeoutInfo=\u00a77Este pedido vai acabar em {0} segundos.
+teleportTop=\u00a77Teleportando para o alto.
+teleportationCommencing=\u00a77Iniciando teleporte...
+teleportationDisabled=\u00a77Teleporte desativado.
+teleportationEnabled=\u00a77Teleporte ativado.
+teleporting=\u00a77Teleportando...
+teleportingPortal=\u00a77Teleportando via portal.
+tempBanned=Banido temporariamente do servidor por {0}
+tempbanExempt=\u00a77Voc\u00ea nao pode banir este jogador temporariamente
+thunder= Voc\u00ea {0} trovejou no seu mundo
+thunderDuration=Voc\u00ea {0} trovejou no seu mundo por {1} segundos.
+timeBeforeHeal=Tempo at\u00e9 a proxima cura: {0}
+timeBeforeTeleport=Tempo antes do proximo teleporte: {0}
+timeFormat=\u00a73{0}\u00a7f or \u00a73{1}\u00a7f or \u00a73{2}\u00a7f
+timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
+timeSet=Horario definido em todos os mundos.
+timeSetPermission=\u00a7cVoc\u00ea nao tem autoriza\u00e7ao para modificar o hor\u00e1rio.
+timeWorldCurrent=O hor\u00e1rio atual no mundo {0} e \u00a73{1}
+timeWorldSet=O hor\u00e1rio foi definido para {0} no: \u00a7c{1}
+tps=Current TPS = {0}
+tradeCompleted=\u00a77Compra concluida.
+tradeSignEmpty=A placa de troca nao tem abastecimento suficiente.
+tradeSignEmptyOwner=Nao a nada para recolher desta placa de compra.
+treeFailure=\u00a7cFalha ao gerar \u00e1rvore. Tente denovo na terra ou grama.
+treeSpawned=\u00a77\u00c1rvore gerada.
+true=\u00a72true\u00a7f
+typeTpaccept=\u00a77Para aceitar o teleporte, digite \u00a7c/tpaccept\u00a77.
+typeTpdeny=\u00a77Para recusar o teleporte, digite \u00a7c/tpdeny\u00a77.
+typeWorldName=\u00a77Voc\u00ea tambem pode digitar o nome do mundo.
+unableToSpawnMob=Incapaz de gerar o mob.
+unbannedIP=Endereco de IP desbanido.
+unbannedPlayer=Jogador desbanido.
+unignorePlayer=Agora voc\u00ea nao esta mais ignorando o {0}.
+unknownItemId=ID do item desconhecido: {0}
+unknownItemInList=Item desconhecido {0} em {1} lista.
+unknownItemName=Nome do item desconhecido: {0}
+unlimitedItemPermission=\u00a7cSem permissao para item ilimitado {0}.
+unlimitedItems=Item ilimitado:
+unmutedPlayer=Jogador {0} desmutado.
+unvanished=\u00a7aEsta mais uma vez visivel.
+unvanishedReload=\u00a7cA recarga foi forcado a se tornar visivel.
+upgradingFilesError=Erro ao aprimorar os arquivos
+userDoesNotExist=O usu\u00e1rio {0} nao existe.
+userIsAway=[AFK]: {0} esta aus\u00eante.
+userIsNotAway=[AFK]: {0} nao esta mais aus\u00eante.
+userJailed=\u00a77Voc\u00ea foi preso, muaha!
+userUsedPortal={0} usou um portal de saida existente.
+userdataMoveBackError=Falha ao mover userdata/{0}.tmp para userdata/{1}
+userdataMoveError=Falha ao mover userdata/{0} para userdata/{1}.tmp
+usingTempFolderForTesting=Usando pasta temporaria para teste:
+vanished=\u00a7aVoce agora desapareceu.
+versionMismatch=Versao incompativel! Atualise o {0} para mesma versao.
+versionMismatchAll=Versao imcompativel! Atualise todos os essentials jars para mesma versao.
+voiceSilenced=\u00a77Sua voz foi silenciada
+warpDeleteError=Problema ao deletar o arquivo warp.
+warpListPermission=\u00a7cVoc\u00ea nao tem permissao para listar os warps.
+warpNotExist=Este warp nao existe.
+warpOverwrite=\u00a7cVoce nao pode substituir essa warp.
+warpSet=\u00a77Warp {0} definido.
+warpUsePermission=\u00a7cVoc\u00ea nao tem permissao para usar este warp.
+warpingTo=\u00a77Warping para {0}.
+warps=Warps: {0}
+warpsCount=\u00a77Aqui tem {0} warps. Exibindo p\u00e1gina {1} de {2}.
+weatherStorm=\u00a77Voc\u00ea modificou o tempo para chuva em {0}
+weatherStormFor=\u00a77Voc\u00ea modificou o tempo para chuva em {0} por {1} segundos
+weatherSun=\u00a77Voc\u00ea modificou o tempo para sol em {0}
+weatherSunFor=\u00a77Voc\u00ea modificou o tempo para sol em {0} por {1} segundos
+whoisAFK=\u00a76 - AFK:\u00a7f {0}
+whoisBanned=\u00a76 - Banido:\u00a7f {0}
+whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
+whoisFly=\u00a76 - Fly modo:\u00a7f {0} ({1})
+whoisGamemode=\u00a76 - Modo de Jogo:\u00a7f {0}
+whoisGeoLocation=\u00a76 - Localizacao:\u00a7f {0}
+whoisGod=\u00a76 - Modo Deus:\u00a7f {0}
+whoisHealth=\u00a76 - Saude:\u00a7f {0}/20
+whoisIPAddress=\u00a76 - IP:\u00a7f {0}
+whoisJail=\u00a76 - Prisao:\u00a7f {0}
+whoisLocation=\u00a76 - Localiza\u00e7ao:\u00a7f ({0}, {1}, {2}, {3})
+whoisMoney=\u00a76 - Dinheiro:\u00a7f {0}
+whoisMuted=\u00a76 - Silenciado:\u00a7f {0}
+whoisNick=\u00a76 - Apelido:\u00a7f {0}
+whoisOp=\u00a76 - OP:\u00a7f {0}
+whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+worth=\u00a77Pilha de {0} vale \u00a7c{1}\u00a77 ({2} item(s) a {3} cada)
+worthMeta=\u00a77Pilha de {0} com metadados de {1} vale \u00a7c{2}\u00a77 ({3} item(s) a {4} cada)
+worthSet=Definir quanto vale
+year=ano
+years=anos
+youAreHealed=\u00a77Voc\u00ea foi curado.
+youHaveNewMail=\u00a7cVoc\u00ea tem {0} mensagens!\u00a7f Digite \u00a77/mail read\u00a7f para ver seu email.
+hatRemoved=\u00a7eYour hat has been removed.
+banFormat=Banned: {0}
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 022143b3f..1d0a64d6a 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: TeamCity
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5]
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally]
commands:
afk:
description: Marks you as away-from-keyboard.
@@ -90,6 +90,11 @@ commands:
essentials:
description: Reloads essentials.
usage: /<command>
+ aliases: [ess]
+ exp:
+ description: Give, set or look at a players exp.
+ usage: /<command> [show|set|give] [playername [amount]]
+ aliases: [eexp,xp]
ext:
description: Extinguish players.
usage: /<command> [player]
@@ -100,12 +105,12 @@ commands:
aliases: [efeed,eat,eeat]
fly:
description: Take off, and soar!
- usage: /<command> [player]
+ usage: /<command> [player] [on|off]
aliases: [efly]
itemdb:
description: Searches for an item.
usage: /<command> <item>
- aliases: [eitemdb]
+ aliases: [eitemdb,itemno,eitemno,durability,dura,edura,edurability]
fireball:
description: Throw a fireball.
usage: /<command> [small]
@@ -119,17 +124,21 @@ commands:
usage: /<command> [player]
aliases: [coords,egetpos,position,eposition,whereami,ewhereami]
gc:
- description: Reports garbage collection info; useful to developers.
+ description: Reports garbage collection and tick info; useful to developers.
usage: /<command>
- aliases: [mem,memory,egc,emem,ememory]
+ aliases: [elag,lag,mem,memory,egc,emem,ememory]
give:
description: Give a player an item.
usage: /<command> <player> <item|numeric> [amount <enchantmentname[:level]> ...]
aliases: [egive]
god:
description: Enables your godly powers.
- usage: /<command> [player]
+ usage: /<command> [player] [on|off]
aliases: [tgm,godmode,egod,etgm,egodmode]
+ hat:
+ description: Get some cool new headgear
+ usage: /<command> [remove]
+ aliases: [ehat]
heal:
description: Heals you or the given player.
usage: /<command> [player]
@@ -180,7 +189,7 @@ commands:
aliases: [ekickall]
kit:
description: Obtains the specified kit or views all available kits.
- usage: /<command> [kit]
+ usage: /<command> [kit] [player]
aliases: [ekit,kits,ekits]
kill:
description: Kills specified player.
@@ -203,7 +212,7 @@ commands:
aliases: [strike,smite,thor,shock,elightning,estrike,esmite,ethor,eshock]
mail:
description: Manages inter-player, intra-server mail.
- usage: /<command> [read|clear|send [to] [message]]
+ usage: /<command> [read|clear|send [to] [message]|sendall [message]]
aliases: [email]
me:
description: Describes an action in the context of the player.
@@ -405,6 +414,10 @@ commands:
description: Allows the unlimited placing of items.
usage: /<command> <list|item|clear> [player]
aliases: [eunlimited,ul,unl,eul,eunl]
+ vanish:
+ description: Hide yourself from other players.
+ usage: /<command> [on|off]
+ aliases: [evanish]
warp:
description: List all warps or warp to the specified location.
usage: /<command> <pagenumber|warp> [player]
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index 63d03a5f9..53763b8ca 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -723,4 +723,22 @@ public class FakeServer implements Server
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public int getMonsterSpawnLimit()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int getAnimalSpawnLimit()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int getWaterAnimalSpawnLimit()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/Essentials/test/com/earth2me/essentials/UtilTest.java b/Essentials/test/com/earth2me/essentials/UtilTest.java
index 71282a18f..2efd39e4c 100644
--- a/Essentials/test/com/earth2me/essentials/UtilTest.java
+++ b/Essentials/test/com/earth2me/essentials/UtilTest.java
@@ -44,67 +44,67 @@ public class UtilTest extends TestCase
Calendar a, b;
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 0, 1);
- assertEquals(" 1 second", Util.formatDateDiff(a, b));
+ assertEquals("1 second", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 0, 2);
- assertEquals(" 2 seconds", Util.formatDateDiff(a, b));
+ assertEquals("2 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 0, 3);
- assertEquals(" 3 seconds", Util.formatDateDiff(a, b));
+ assertEquals("3 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 1, 0);
- assertEquals(" 1 minute", Util.formatDateDiff(a, b));
+ assertEquals("1 minute", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 2, 0);
- assertEquals(" 2 minutes", Util.formatDateDiff(a, b));
+ assertEquals("2 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 3, 0);
- assertEquals(" 3 minutes", Util.formatDateDiff(a, b));
+ assertEquals("3 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 11, 0, 0);
- assertEquals(" 1 hour", Util.formatDateDiff(a, b));
+ assertEquals("1 hour", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 12, 0, 0);
- assertEquals(" 2 hours", Util.formatDateDiff(a, b));
+ assertEquals("2 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 13, 0, 0);
- assertEquals(" 3 hours", Util.formatDateDiff(a, b));
+ assertEquals("3 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 2, 10, 0, 0);
- assertEquals(" 1 day", Util.formatDateDiff(a, b));
+ assertEquals("1 day", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 3, 10, 0, 0);
- assertEquals(" 2 days", Util.formatDateDiff(a, b));
+ assertEquals("2 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 4, 10, 0, 0);
- assertEquals(" 3 days", Util.formatDateDiff(a, b));
+ assertEquals("3 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 2, 1, 10, 0, 0);
- assertEquals(" 1 month", Util.formatDateDiff(a, b));
+ assertEquals("1 month", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 3, 1, 10, 0, 0);
- assertEquals(" 2 months", Util.formatDateDiff(a, b));
+ assertEquals("2 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 4, 1, 10, 0, 0);
- assertEquals(" 3 months", Util.formatDateDiff(a, b));
+ assertEquals("3 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2011, 1, 1, 10, 0, 0);
- assertEquals(" 1 year", Util.formatDateDiff(a, b));
+ assertEquals("1 year", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2012, 1, 1, 10, 0, 0);
- assertEquals(" 2 years", Util.formatDateDiff(a, b));
+ assertEquals("2 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2013, 1, 1, 10, 0, 0);
- assertEquals(" 3 years", Util.formatDateDiff(a, b));
+ assertEquals("3 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2011, 4, 5, 23, 38, 12);
- assertEquals(" 1 year 3 months 4 days 13 hours 38 minutes 12 seconds", Util.formatDateDiff(a, b));
+ assertEquals("1 year 3 months 4 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 9, 17, 23, 45, 45);
b = new GregorianCalendar(2015, 3, 7, 10, 0, 0);
- assertEquals(" 4 years 5 months 20 days 10 hours 14 minutes 15 seconds", Util.formatDateDiff(a, b));
+ assertEquals("4 years 5 months 20 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2011, 4, 31, 10, 0, 0);
b = new GregorianCalendar(2011, 4, 31, 10, 5, 0);
- assertEquals(" 5 minutes", Util.formatDateDiff(a, b));
+ assertEquals("5 minutes", Util.formatDateDiff(a, b));
}
public void testFDDpast()
@@ -112,63 +112,63 @@ public class UtilTest extends TestCase
Calendar a, b;
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 59);
- assertEquals(" 1 second", Util.formatDateDiff(a, b));
+ assertEquals("1 second", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 58);
- assertEquals(" 2 seconds", Util.formatDateDiff(a, b));
+ assertEquals("2 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 57);
- assertEquals(" 3 seconds", Util.formatDateDiff(a, b));
+ assertEquals("3 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 0);
- assertEquals(" 1 minute", Util.formatDateDiff(a, b));
+ assertEquals("1 minute", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 58, 0);
- assertEquals(" 2 minutes", Util.formatDateDiff(a, b));
+ assertEquals("2 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 57, 0);
- assertEquals(" 3 minutes", Util.formatDateDiff(a, b));
+ assertEquals("3 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 0, 0);
- assertEquals(" 1 hour", Util.formatDateDiff(a, b));
+ assertEquals("1 hour", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 8, 0, 0);
- assertEquals(" 2 hours", Util.formatDateDiff(a, b));
+ assertEquals("2 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 7, 0, 0);
- assertEquals(" 3 hours", Util.formatDateDiff(a, b));
+ assertEquals("3 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 5, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 4, 10, 0, 0);
- assertEquals(" 1 day", Util.formatDateDiff(a, b));
+ assertEquals("1 day", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 5, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 3, 10, 0, 0);
- assertEquals(" 2 days", Util.formatDateDiff(a, b));
+ assertEquals("2 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 5, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 2, 10, 0, 0);
- assertEquals(" 3 days", Util.formatDateDiff(a, b));
+ assertEquals("3 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 5, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 4, 1, 10, 0, 0);
- assertEquals(" 1 month", Util.formatDateDiff(a, b));
+ assertEquals("1 month", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 5, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 3, 1, 10, 0, 0);
- assertEquals(" 2 months", Util.formatDateDiff(a, b));
+ assertEquals("2 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 5, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 2, 1, 10, 0, 0);
- assertEquals(" 3 months", Util.formatDateDiff(a, b));
+ assertEquals("3 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2009, 1, 1, 10, 0, 0);
- assertEquals(" 1 year", Util.formatDateDiff(a, b));
+ assertEquals("1 year", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2008, 1, 1, 10, 0, 0);
- assertEquals(" 2 years", Util.formatDateDiff(a, b));
+ assertEquals("2 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2007, 1, 1, 10, 0, 0);
- assertEquals(" 3 years", Util.formatDateDiff(a, b));
+ assertEquals("3 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2009, 4, 5, 23, 38, 12);
- assertEquals(" 8 months 26 days 10 hours 21 minutes 48 seconds", Util.formatDateDiff(a, b));
+ assertEquals("8 months 26 days 10 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 9, 17, 23, 45, 45);
b = new GregorianCalendar(2000, 3, 7, 10, 0, 0);
- assertEquals(" 10 years 6 months 10 days 13 hours 45 minutes 45 seconds", Util.formatDateDiff(a, b));
+ assertEquals("10 years 6 months 10 days", Util.formatDateDiff(a, b));
}
}
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
index ddf928725..58b094793 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
@@ -62,6 +62,8 @@ public abstract class EssentialsChatPlayer implements Listener
return "shout";
case '?':
return "question";
+ //case '@':
+ //return "admin";
default:
return "";
}
@@ -119,22 +121,25 @@ public abstract class EssentialsChatPlayer implements Listener
{
String type = _("chatTypeLocal");
final User onlineUser = ess.getUser(onlinePlayer);
- //TODO: remove reference to op
- if (onlineUser.isIgnoredPlayer(sender.getName()) && !sender.isOp())
+ if (onlineUser.isIgnoredPlayer(sender))
{
continue;
}
if (!onlineUser.equals(sender))
{
+ boolean abort = false;
final Location playerLoc = onlineUser.getLocation();
if (playerLoc.getWorld() != world)
{
- continue;
+ abort = true;
}
final double delta = playerLoc.distanceSquared(loc);
-
if (delta > chatStore.getRadius())
{
+ abort = true;
+ }
+ if (abort)
+ {
if (onlineUser.isAuthorized("essentials.chat.spy"))
{
type = type.concat(_("chatTypeSpy"));
diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml
index af0ed0c13..b75ab8ecc 100644
--- a/EssentialsChat/src/plugin.yml
+++ b/EssentialsChat/src/plugin.yml
@@ -5,6 +5,6 @@ main: com.earth2me.essentials.chat.EssentialsChat
version: TeamCity
website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy]
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions] \ No newline at end of file
diff --git a/EssentialsGroupManager/src/globalgroups.yml b/EssentialsGroupManager/src/globalgroups.yml
index a08f9600e..04b670ae7 100644
--- a/EssentialsGroupManager/src/globalgroups.yml
+++ b/EssentialsGroupManager/src/globalgroups.yml
@@ -114,24 +114,33 @@ groups:
- essentials.balance.others
- essentials.balancetop
- essentials.chat.color
+ - essentials.chat.format
- essentials.chat.shout
- essentials.chat.question
- essentials.compass
+ - essentials.delhome
- essentials.depth
+ - essentials.getpos
- essentials.home
- essentials.ignore
+ - essentials.itemdb
- essentials.kit
- essentials.kit.tools
- essentials.mail
- essentials.mail.send
- essentials.me
- essentials.msg
+ - essentials.msg.color
+ - essentials.msg.format
- essentials.nick
- essentials.pay
- essentials.ping
- essentials.powertool
+ - essentials.powertooltoggle
- essentials.protect
+ - essentials.seen
- essentials.sethome
+ - essentials.sethome.multiple
- essentials.signs.use.*
- essentials.signs.create.disposal
- essentials.signs.create.mail
@@ -153,15 +162,21 @@ groups:
g:essentials_moderator:
permissions:
+ - -essentials.spawner.enderdragon
+ - essentials.afk.kickexempt
- essentials.ban
- essentials.ban.notify
- essentials.banip
- essentials.broadcast
+ - essentials.chat.url
+ - essentials.chat.magic
- essentials.clearinventory
- essentials.delwarp
- essentials.eco.loan
- essentials.ext
+ - essentials.fly
- essentials.getpos
+ - essentials.getpos.others
- essentials.helpop.recieve
- essentials.home.others
- essentials.invsee
@@ -170,13 +185,19 @@ groups:
- essentials.kick
- essentials.kick.notify
- essentials.kill
+ - essentials.kit.*
+ - essentials.msg.magic
- essentials.mute
+ - essentials.nick.color
- essentials.nick.others
- essentials.realname
+ - essentials.seen.banreason
+ - essentials.seen.extra
- essentials.setwarp
- essentials.signs.create.*
- essentials.signs.break.*
- essentials.spawner
+ - essentials.spawner.*
- essentials.thunder
- essentials.time
- essentials.time.set
@@ -188,6 +209,7 @@ groups:
- essentials.togglejail
- essentials.top
- essentials.tp
+ - essentials.tp.others
- essentials.tphere
- essentials.tppos
- essentials.tptoggle
@@ -196,6 +218,7 @@ groups:
- essentials.weather
- essentials.whois
- essentials.world
+ - essentials.world.*
g:essentials_admin:
permissions:
@@ -283,4 +306,4 @@ groups:
permissions:
- vanish.silentjoin
- vanish.silentquit
- - vanish.silentchests \ No newline at end of file
+ - vanish.silentchests
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index 1868e20c1..7e558eb81 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -194,7 +194,7 @@ public class EssentialsProtectEntityListener implements Listener
@EventHandler(priority = EventPriority.HIGHEST)
public void onEntityExplode(final EntityExplodeEvent event)
{
- if (event.isCancelled())
+ if (event.isCancelled() || event.getEntity() == null)
{
return;
}
diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml
index 2c9fca434..21f77db78 100644
--- a/EssentialsSpawn/src/plugin.yml
+++ b/EssentialsSpawn/src/plugin.yml
@@ -11,6 +11,8 @@ commands:
setspawn:
description: Set the spawnpoint to your current position.
usage: /<command> <group>
+ aliases: [esetspawn]
spawn:
description: Teleport to the spawnpoint.
- usage: /<command> [player] \ No newline at end of file
+ usage: /<command> [player]
+ aliases: [espawn] \ No newline at end of file
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index bb44d3127..164f40c2a 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -4,6 +4,7 @@ import com.earth2me.essentials.Console;
import com.earth2me.essentials.EssentialsConf;
import com.earth2me.essentials.IConf;
import com.earth2me.essentials.IUser;
+import com.earth2me.essentials.Util;
import java.io.File;
import java.util.*;
import java.util.logging.Handler;
@@ -61,7 +62,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
disconnect();
connect();
}
- chat.sendMessage(message.replaceAll("ยง[0-9a-f]", ""));
+ chat.sendMessage(Util.stripFormat(message));
return true;
}
}
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
index 912400ba3..cc304c6dd 100644
--- a/lib/bukkit.jar
+++ b/lib/bukkit.jar
Binary files differ
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index 815d0a929..39c783fa3 100644
--- a/lib/craftbukkit.jar
+++ b/lib/craftbukkit.jar
Binary files differ