summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-05-04 18:22:55 +0100
committerKHobbits <rob@khobbits.co.uk>2013-05-04 18:22:55 +0100
commit7646dffc170905674700497921598a86e78b6283 (patch)
treec756c77616e74e154e31b79480203b1a51ff35fe
parentb66b8f5cc7dfe1ea0d72840e24ba1fee70bc88dc (diff)
downloadEssentials-7646dffc170905674700497921598a86e78b6283.tar
Essentials-7646dffc170905674700497921598a86e78b6283.tar.gz
Essentials-7646dffc170905674700497921598a86e78b6283.tar.lz
Essentials-7646dffc170905674700497921598a86e78b6283.tar.xz
Essentials-7646dffc170905674700497921598a86e78b6283.zip
cleanup
-rw-r--r--Essentials/src/com/earth2me/essentials/Kit.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandfeed.java2
-rw-r--r--Essentials/src/messages.properties2
-rw-r--r--Essentials/src/messages_cs.properties2
-rw-r--r--Essentials/src/messages_da.properties2
-rw-r--r--Essentials/src/messages_de.properties2
-rw-r--r--Essentials/src/messages_en.properties2
-rw-r--r--Essentials/src/messages_es.properties2
-rw-r--r--Essentials/src/messages_fi.properties2
-rw-r--r--Essentials/src/messages_fr.properties2
-rw-r--r--Essentials/src/messages_it.properties2
-rw-r--r--Essentials/src/messages_nl.properties2
-rw-r--r--Essentials/src/messages_pl.properties2
-rw-r--r--Essentials/src/messages_pt.properties3
-rw-r--r--Essentials/src/messages_ro.properties2
-rw-r--r--Essentials/src/messages_se.properties2
-rw-r--r--Essentials/src/messages_zh.properties2
-rw-r--r--Essentials/src/messages_zh_HK.properties2
-rw-r--r--Essentials/src/messages_zh_TW.properties2
19 files changed, 24 insertions, 23 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java
index 55b85a779..7d7aae780 100644
--- a/Essentials/src/com/earth2me/essentials/Kit.java
+++ b/Essentials/src/com/earth2me/essentials/Kit.java
@@ -22,22 +22,22 @@ public class Kit
{
final ConfigurationSection kits = ess.getSettings().getKits();
final StringBuilder list = new StringBuilder();
- for (String kiteItem : kits.getKeys(false))
+ for (String kitItem : kits.getKeys(false))
{
if (user == null)
{
- list.append(" ").append(capitalCase(kiteItem));
+ list.append(" ").append(capitalCase(kitItem));
}
- else if (user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
+ else if (user.isAuthorized("essentials.kits." + kitItem.toLowerCase(Locale.ENGLISH)))
{
String cost = "";
- Double costPrice = new Trade("kit-" + kiteItem.toLowerCase(Locale.ENGLISH), ess).getCommandCost(user);
+ Double costPrice = new Trade("kit-" + kitItem.toLowerCase(Locale.ENGLISH), ess).getCommandCost(user);
if (costPrice > 0d)
{
cost = _("kitCost", Util.displayCurrency(costPrice, ess));
}
- list.append(" ").append(capitalCase(kiteItem)).append(cost);
+ list.append(" ").append(capitalCase(kitItem)).append(cost);
}
}
return list.toString().trim();
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
index 592fa9eb4..e37a659b6 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
@@ -37,7 +37,7 @@ public class Commandfeed extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- feedOtherPlayers(server, sender, args[1]);
+ feedOtherPlayers(server, sender, args[0]);
}
private void feedOtherPlayers(final Server server, final CommandSender sender, final String name) throws NotEnoughArgumentsException, QuietAbortException
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index eaff46d13..e07ab31f5 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a76Smiting\u00a7c {0}
listAfkTag= \u00a77[AFK]\u00a7r
listAmount= \u00a76There are \u00a7c{0}\u00a76 out of maximum \u00a7c{1}\u00a76 players online.
listAmountHidden= \u00a76There are \u00a7c{0}\u00a76/{1}\u00a76 out of maximum \u00a7c{2}\u00a76 players online.
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag= \u00a77[HIDDEN]\u00a7r
loadWarpError=\u00a74Failed to load warp {0}.
localFormat=[L]<{0}> {1}
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index ce2337922..d9254e582 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -232,7 +232,7 @@ 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:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[HIDDEN]\u00a7f
loadWarpError=Chyba pri nacitani warpu: {0}
localFormat=Jazyk: <{0}> {1}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 2f5d2daa6..53df0cbb4 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77Kaster lyn efter {0}
listAfkTag = \u00a77[AFK]\u00a7f
listAmount = \u00a79Der er \u00a7c{0}\u00a79 ud af maksimum\u00a7c{1}\u00a79 spillere online.
listAmountHidden = \u00a79Der er \u00a7c{0}\u00a77/{1}\u00a79 ud af maksimum \u00a7c{2}\u00a79 spillere online.
-listGroupTag={0}\u00a7f:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[HIDDEN]\u00a7f
loadWarpError=Kunne ikke l\u00c3\u00a6se warp {0}
localFormat=Local: <{0}> {1}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index f6e8ef6d5..a8806c5af 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77Peinige {0}
listAfkTag = \u00a77[Inaktiv]\u00a7f
listAmount = \u00a79Es sind \u00a7c{0}\u00a79 von maximal \u00a7c{1}\u00a79 Spielern online.
listAmountHidden = \u00a79Es sind \u00a7c{0}\u00a77/{1}\u00a79 von maximal \u00a7c{2}\u00a79 Spielern online.
-listGroupTag={0}\u00a7f:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[Versteckt]\u00a7f
loadWarpError=Fehler beim Laden von Warp-Punkt {0}
localFormat=Lokal: <{0}> {1}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index eaff46d13..e07ab31f5 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a76Smiting\u00a7c {0}
listAfkTag= \u00a77[AFK]\u00a7r
listAmount= \u00a76There are \u00a7c{0}\u00a76 out of maximum \u00a7c{1}\u00a76 players online.
listAmountHidden= \u00a76There are \u00a7c{0}\u00a76/{1}\u00a76 out of maximum \u00a7c{2}\u00a76 players online.
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag= \u00a77[HIDDEN]\u00a7r
loadWarpError=\u00a74Failed to load warp {0}.
localFormat=[L]<{0}> {1}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index aac5660e4..d3b00162b 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77Golpeando a {0}
listAfkTag = \u00a77[Lejos]\u00a7f
listAmount = \u00a79Hay \u00a7c{0}\u00a79 jugadores de un maximo de \u00a7c{1}\u00a79 jugadores online.
listAmountHidden = \u00a79Hay \u00a7c{0}\u00a79 jugadores de un maximo de \u00a7c{1}\u00a79 jugadores online.
-listGroupTag={0}\u00a7f:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[ESCONDIDO]\u00a7f
loadWarpError=Error al cargar el teletransporte {0}
localFormat=Local: <{0}> {1}
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 287f79ae6..ab2726c4a 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -229,7 +229,7 @@ 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:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[HIDDEN]\u00a7f
loadWarpError=Virhe ladattaessa warppia {0}
localFormat=Paikallinen: <{0}> {1}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 8b7d30af6..ef91c9cb8 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77{0} a \u00e9t\u00e9 foudroy\u00e9.
listAfkTag = \u00a77[AFK]\u00a7f
listAmount = \u00a79Il y a \u00a7c{0}\u00a79 joueurs en ligne sur \u00a7c{1}\u00a79 au total.
listAmountHidden = \u00a79Il y a \u00a7c{0}\u00a77/{1}\u00a79 sur un maximum de \u00a7c{2}\u00a79 joueurs en ligne.
-listGroupTag={0}\u00a7f:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[MASQU\u00c9]\u00a7f
loadWarpError=\u00c9chec du chargement du warp {0}.
localFormat=Local : <{0}> {1}
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index ce69a7c3b..e37b66e2e 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -229,7 +229,7 @@ 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:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[HIDDEN]\u00a7f
loadWarpError=Impossibile caricare il warp {0}
localFormat=Formato locale: <{0}> {1}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index d137a679f..edf6c10a3 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77Brand {0}
listAfkTag = \u00a77[AFK]\u00a7f
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:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[VERBORGEN]\u00a7f
loadWarpError=Fout bij het laden van warp {0}
localFormat=Lokaal: <{0}> {1}
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index f4230d89f..9971624a1 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77Uderzono piorunem\u00a7c {0}\u00a77.
listAfkTag= \u00a77[AFK]\u00a7f
listAmount= \u00a77Na serwerze jest \u00a7c{0}\u00a77 graczy z maksimum \u00a7c{1}\u00a77 online.
listAmountHidden= \u00a77Na serwerze jest \u00a7c{0}\u00a77/{1}\u00a77 graczy z maksimum \u00a7c{2}\u00a77 online.
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag= \u00a77[UKRYTY]\u00a7r
loadWarpError=\u00a74Blad przy wczytywaniu warpu {0}.
localFormat=[L]<{0}> {1}
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 2bf2f201b..f95ddc49b 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -228,7 +228,7 @@ lightningUse=\u00a76Castigando\u00a7c {0}
listAfkTag= \u00a77[AFK]\u00a7r
listAmount= \u00a76H\u00c3\u00a1 \u00a7c{0}\u00a76 de no m\u00c3\u00a1ximo \u00a7c{1}\u00a76 jogadores online.
listAmountHidden= \u00a76H\u00c3\u00a1 \u00a7c{0}\u00a76/{1}\u00a76 de no m\u00c3\u00a1ximo \u00a7c{2}\u00a76 jogadores online.
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag= \u00a77[ESCONDIDO]\u00a7r
loadWarpError=\u00a74Falha ao carregar o warp {0}.
localFormat=[L]<{0}> {1}
@@ -538,3 +538,4 @@ setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}\u00a7a''s balance to {1}.
insufficientFunds=\u00a74Insufficient funds available.
kitCost=\ ({0})
+killExempt=\u00a74You can not kill {0}
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index 29ccea481..6974110fa 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a76L-ai fulgerat pe\u00a7c {0}
listAfkTag= \u00a77[AFK]\u00a7r
listAmount= \u00a76Sunt \u00a7c{0}\u00a76 din maxim \u00a7c{1}\u00a76 jucatori online.
listAmountHidden= \u00a76Sunt \u00a7c{0}\u00a76/{1}\u00a76 din maxim \u00a7c{2}\u00a76 jucatori online.
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag= \u00a77[Ascuns]\u00a7r
loadWarpError=\u00a74Incarcarea teleportarii a esuat {0}.
localFormat=[L]<{0}> {1}
diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties
index a0f3f9c5c..04a779258 100644
--- a/Essentials/src/messages_se.properties
+++ b/Essentials/src/messages_se.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a77En blixt kommer sl\u00e5 ner p\u00e5 {0}
listAfkTag = \u00a77[AFK]\u00a7f
listAmount = \u00a79Det \u00e4r \u00a7c{0}\u00a79 av maximalt \u00a7c{1}\u00a79 spelare online.
listAmountHidden = \u00a79Det \u00e4r \u00a7c{0}\u00a77/{1}\u00a79 Av maximalt \u00a7c{2}\u00a79 spelare online.
-listGroupTag={0}\u00a7f:
+listGroupTag={0}\u00a7f:
listHiddenTag = \u00a77[G\u00d6MD]\u00a7f
loadWarpError=Kunde inte ladda warp {0}
localFormat=Lokal: <{0}> {1}
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index 4fef1d1a0..c9af3035b 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a76\u96f7\u51fb\u4e2d\u4e86\u00a7c {0}
listAfkTag = \u00a77[\u79bb\u5f00]\u00a7r
listAmount = \u00a76\u5f53\u524d\u6709 \u00a7c{0}\u00a76 \u4e2a\u73a9\u5bb6\u5728\u7ebf,\u6700\u5927\u5728\u7ebf\u4eba\u6570\u4e3a \u00a7c{1}\u00a76 \u4e2a\u73a9\u5bb6.
listAmountHidden = \u00a76\u5f53\u524d\u6709 \u00a7c{0}\u00a76/{1}\u00a76 \u4e2a\u73a9\u5bb6\u5728\u7ebf,\u6700\u5927\u5728\u7ebf\u4eba\u6570 \u00a7c{2}\u00a76 \u4e2a\u73a9\u5bb6
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag = \u00a77[\u9690\u8eab]\u00a7r
loadWarpError=\u00a74\u52a0\u8f7d\u5730\u6807 {0} \u5931\u8d25
localFormat=\u4f4d\u7f6e:<{0}> {1}
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 283d450cc..ac3ff706b 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a76\u96f7\u64ca\u4e2d\u4e86\u00a7c {0}
listAfkTag = \u00a77[\u96e2\u958b]\u00a7r
listAmount = \u00a76\u7576\u524d\u6709 \u00a7c{0}\u00a76 \u500b\u73a9\u5bb6\u5728\u7dda,\u6700\u5927\u5728\u7dda\u4eba\u6578\u70ba \u00a7c{1}\u00a76 \u500b\u73a9\u5bb6.
listAmountHidden = \u00a76\u7576\u524d\u6709 \u00a7c{0}\u00a76/{1}\u00a76 \u500b\u73a9\u5bb6\u5728\u7dda,\u6700\u5927\u5728\u7dda\u4eba\u6578 \u00a7c{2}\u00a76 \u500b\u73a9\u5bb6
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag = \u00a77[\u96b1\u8eab]\u00a7r
loadWarpError=\u00a74\u52a0\u8f09\u5730\u6a19 {0} \u5931\u6557
localFormat=\u4f4d\u7f6e:<{0}> {1}
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index 6b3628de7..0580c16db 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -229,7 +229,7 @@ lightningUse=\u00a76\u96f7\u64ca\u4e2d\u4e86\u00a7c {0}
listAfkTag = \u00a77[\u96e2\u958b]\u00a7r
listAmount = \u00a76\u7576\u524d\u6709 \u00a7c{0}\u00a76 \u500b\u73a9\u5bb6\u5728\u7dda,\u6700\u5927\u5728\u7dda\u4eba\u6578\u70ba \u00a7c{1}\u00a76 \u500b\u73a9\u5bb6.
listAmountHidden = \u00a76\u7576\u524d\u6709 \u00a7c{0}\u00a76/{1}\u00a76 \u500b\u73a9\u5bb6\u5728\u7dda,\u6700\u5927\u5728\u7dda\u4eba\u6578 \u00a7c{2}\u00a76 \u500b\u73a9\u5bb6
-listGroupTag={0}\u00a7r:
+listGroupTag={0}\u00a7r:
listHiddenTag = \u00a77[\u96b1\u8eab]\u00a7r
loadWarpError=\u00a74\u8f09\u5165\u5730\u6a19 {0} \u5931\u6557
localFormat=\u4f4d\u7f6e:<{0}> {1}