summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Essentials/src/com/earth2me/essentials/Teleport.java9
-rw-r--r--Essentials/src/com/earth2me/essentials/UserData.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/Util.java48
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandhome.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java9
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignProtection.java3
-rw-r--r--Essentials/src/messages.properties10
-rw-r--r--Essentials/src/messages_da.properties9
-rw-r--r--Essentials/src/messages_de.properties9
-rw-r--r--Essentials/src/messages_en.properties9
-rw-r--r--Essentials/src/messages_fr.properties9
-rw-r--r--Essentials/src/messages_nl.properties9
-rw-r--r--Essentials/src/plugin.yml6
15 files changed, 129 insertions, 32 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index 14574b83c..608663561 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -264,14 +264,7 @@ public class Teleport implements Runnable
final Location loc = user.getHome(home);
if (loc == null)
{
- if (ess.getSettings().spawnIfNoHome())
- {
- respawn(ess.getSpawn(), chargeFor);
- }
- else
- {
- throw new NotEnoughArgumentsException();
- }
+ throw new NotEnoughArgumentsException();
}
teleport(new Target(loc), chargeFor);
}
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java
index e5c7385b2..30bb7a2b8 100644
--- a/Essentials/src/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/UserData.java
@@ -240,6 +240,12 @@ public abstract class UserData extends PlayerExtension implements IConf
}
+ public void clearAllPowertools() {
+ powertools.clear();
+ config.setProperty("powertools", powertools);
+ config.save();
+ }
+
public List<String> getPowertool(ItemStack stack)
{
return (List<String>)powertools.get(stack.getTypeId());
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 6565a9f57..7d0093680 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -14,10 +14,12 @@ import java.text.MessageFormat;
import java.util.Calendar;
import java.util.Enumeration;
import java.util.GregorianCalendar;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
@@ -217,6 +219,40 @@ public class Util
return c.getTimeInMillis();
}
+ // The player can stand inside these materials
+ private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>();
+
+ static {
+ AIR_MATERIALS.add(Material.AIR.getId());
+ AIR_MATERIALS.add(Material.SAPLING.getId());
+ AIR_MATERIALS.add(Material.POWERED_RAIL.getId());
+ AIR_MATERIALS.add(Material.DETECTOR_RAIL.getId());
+ AIR_MATERIALS.add(Material.DEAD_BUSH.getId());
+ AIR_MATERIALS.add(Material.RAILS.getId());
+ AIR_MATERIALS.add(Material.YELLOW_FLOWER.getId());
+ AIR_MATERIALS.add(Material.RED_ROSE.getId());
+ AIR_MATERIALS.add(Material.RED_MUSHROOM.getId());
+ AIR_MATERIALS.add(Material.BROWN_MUSHROOM.getId());
+ AIR_MATERIALS.add(Material.SEEDS.getId());
+ AIR_MATERIALS.add(Material.SIGN_POST.getId());
+ AIR_MATERIALS.add(Material.WALL_SIGN.getId());
+ AIR_MATERIALS.add(Material.LADDER.getId());
+ AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
+ AIR_MATERIALS.add(Material.REDSTONE_WIRE.getId());
+ AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
+ AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
+ AIR_MATERIALS.add(Material.TORCH.getId());
+ AIR_MATERIALS.add(Material.SOIL.getId());
+ AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
+ AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
+ AIR_MATERIALS.add(Material.TRAP_DOOR.getId());
+ AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
+ AIR_MATERIALS.add(Material.STONE_PLATE.getId());
+ AIR_MATERIALS.add(Material.WOOD_PLATE.getId());
+ AIR_MATERIALS.add(Material.IRON_DOOR_BLOCK.getId());
+ AIR_MATERIALS.add(Material.WOODEN_DOOR.getId());
+ }
+
public static Location getSafeDestination(final Location loc) throws Exception
{
if (loc == null || loc.getWorld() == null)
@@ -224,9 +260,9 @@ public class Util
throw new Exception(Util.i18n("destinationNotSet"));
}
final World world = loc.getWorld();
- int x = loc.getBlockX();
- int y = loc.getBlockY();
- int z = loc.getBlockZ();
+ int x = (int)Math.round(loc.getX());
+ int y = (int)Math.round(loc.getY());
+ int z = (int)Math.round(loc.getZ());
while (isBlockAboveAir(world, x, y, z))
{
@@ -264,7 +300,7 @@ public class Util
private static boolean isBlockAboveAir(final World world, final int x, final int y, final int z)
{
- return world.getBlockAt(x, y - 1, z).getType() == Material.AIR;
+ return AIR_MATERIALS.contains(world.getBlockAt(x, y - 1, z).getType().getId());
}
public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
@@ -280,8 +316,8 @@ public class Util
return true;
}
- if ((world.getBlockAt(x, y, z).getType() != Material.AIR)
- || (world.getBlockAt(x, y + 1, z).getType() != Material.AIR))
+ if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
+ || (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
{
return true;
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index fbcaa555d..2ee2661e6 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -53,6 +53,10 @@ public class Commandhome extends EssentialsCommand
{
user.getTeleport().home(u, homes.get(0), charge);
}
+ else if (ess.getSettings().spawnIfNoHome())
+ {
+ user.getTeleport().respawn(ess.getSpawn(), charge);
+ }
else
{
user.sendMessage(Util.format("homes", Util.joinList(homes)));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
index b4977167f..c9e8dea58 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
@@ -19,6 +19,16 @@ public class Commandpowertool extends EssentialsCommand
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
+ String command = getFinalArg(args, 0);
+
+ // check to see if this is a clear all command
+ if(command != null && command.equalsIgnoreCase("clearall"))
+ {
+ user.clearAllPowertools();
+ user.sendMessage(Util.i18n("powerToolClearAll"));
+ return;
+ }
+
final ItemStack itemStack = user.getItemInHand();
if (itemStack == null || itemStack.getType() == Material.AIR)
{
@@ -26,7 +36,6 @@ public class Commandpowertool extends EssentialsCommand
}
final String itemName = itemStack.getType().toString().toLowerCase().replaceAll("_", " ");
- String command = getFinalArg(args, 0);
List<String> powertools = user.getPowertool(itemStack);
if (command != null && !command.isEmpty())
{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
index 6f60f7f43..625a375d8 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
@@ -15,7 +15,6 @@ public class Commandtogglejail extends EssentialsCommand
super("togglejail");
}
- //TODO: move these to messages file
@Override
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
{
@@ -73,7 +72,7 @@ public class Commandtogglejail extends EssentialsCommand
if (args.length >= 2 && p.isJailed() && !args[1].equalsIgnoreCase(p.getJail()))
{
- sender.sendMessage("§cPerson is already in jail " + p.getJail());
+ sender.sendMessage(Util.format("jailAlreadyIncarcerated", p.getJail()));
return;
}
@@ -82,7 +81,7 @@ public class Commandtogglejail extends EssentialsCommand
String time = getFinalArg(args, 2);
long timeDiff = Util.parseDateDiff(time, true);
p.setJailTimeout(timeDiff);
- sender.sendMessage("Jail time extend to " + Util.formatDateDiff(timeDiff));
+ sender.sendMessage(Util.format("jailSentenceExtended", Util.formatDateDiff(timeDiff)));
return;
}
@@ -94,13 +93,13 @@ public class Commandtogglejail extends EssentialsCommand
}
p.setJailed(false);
p.setJailTimeout(0);
- p.sendMessage("§7You have been released");
+ p.sendMessage(Util.format("jailReleasedPlayerNotify"));
p.setJail(null);
if (!(p.getBase() instanceof OfflinePlayer))
{
p.getTeleport().back();
}
- sender.sendMessage("§7Player " + p.getName() + " unjailed.");
+ sender.sendMessage(Util.format("jailReleased", p.getName()));
}
}
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index f4109b3bb..17d7a5993 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -20,10 +20,6 @@ public class EssentialsSign
{
private static final Set<Material> EMPTY_SET = new HashSet<Material>();
protected transient final String signName;
- //TODO: Add these settings to messages
- private static final String FORMAT_SUCCESS = "§1[%s]";
- private static final String FORMAT_TEMPLATE = "[%s]";
- private static final String FORMAT_FAIL = "§4[%s]";
public EssentialsSign(final String signName)
{
@@ -41,7 +37,7 @@ public class EssentialsSign
// they won't change it to §1[Signname]
return true;
}
- sign.setLine(0, String.format(FORMAT_FAIL, this.signName));
+ sign.setLine(0, Util.format("signFormatFail", this.signName));
try
{
final boolean ret = onSignCreate(sign, user, getUsername(user), ess);
@@ -65,12 +61,12 @@ public class EssentialsSign
public String getSuccessName()
{
- return String.format(FORMAT_SUCCESS, this.signName);
+ return Util.format("signFormatSuccess", this.signName);
}
public String getTemplateName()
{
- return String.format(FORMAT_TEMPLATE, this.signName);
+ return Util.format("signFormatTemplate", this.signName);
}
private String getUsername(final User user)
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
index 8ecf34e01..1db607606 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
@@ -40,8 +40,7 @@ public class SignProtection extends EssentialsSign
sign.setLine(3, "§1" + username);
return true;
}
- //TODO: move to messages
- player.sendMessage("§4You are not allowed to create sign here.");
+ player.sendMessage(Util.i18n("signProtectInvalidLocation"));
return false;
}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 5190c6968..b7e215c10 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -131,8 +131,12 @@ itemSold = \u00a77Sold for \u00a7c {0} \u00a77 ({1} items at {2} each)
itemSoldConsole = {0} sold {1} for \u00a77 {2} \u00a77 ({3} items at {4} each)
itemSpawn = \u00a77Giving {0} of {1}
itemsCsvNotLoaded = Could not load items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
jailMessage = \u00a7cYou do the crime, you do the time.
jailNotExist = That jail does not exist.
+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.
kickDefault = Kicked from server
@@ -163,6 +167,7 @@ minute = minute
minutes = minutes
missingItems = You do not have {0}x {1}.
missingPrefixSuffix = Missing a prefix or suffix for {0}
+mobsAvailable = \u00a77Mobs: {0}
mobSpawnError = Error while changing mob spawner.
mobSpawnLimit = Mob quantity limited to server limit
mobSpawnTarget = Target block must be a mob spawner.
@@ -239,6 +244,7 @@ possibleWorlds = \u00a77Possible worlds are the numbers 0 through {0}.
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.
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}.
@@ -265,6 +271,10 @@ serverFull = Server is full
setSpawner = Changed spawner type to {0}
sheepMalformedColor = Malformed color.
shoutFormat = \u00a77[Shout]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
similarWarpExist = A warp with a similar name already exists.
slimeMalformedSize = Malformed size.
soloMob = That mob likes to be alone
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index b27154190..114b63f7e 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -131,8 +131,12 @@ itemSold = \u00a77Solgte for \u00a7c {0} \u00a77 ({1} elementer for {2} hver)
itemSoldConsole = {0} solgte {1} for \u00a77 {2} \u00a77 ({3} elementer for {4} hver)
itemSpawn = \u00a77Giver {0} af {1}
itemsCsvNotLoaded = Kunne ikke indl\u00e6se items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
jailMessage = \u00a7cBryd reglerne, og tag din straf.
jailNotExist = Det f\u00e6ngsel eksisterer ikke.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
jailSet = \u00a77F\u00e6ngsel {0} er blevet sat
jumpError = Det ville skade din computer''s hjerne.
kickDefault = Kicket fra serveren
@@ -239,6 +243,7 @@ possibleWorlds = \u00a77Mulige verdener er numrene 0 igennem {0}.
powerToolAir = Kommando kan ikke blive tildelt luft.
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}.
@@ -265,6 +270,10 @@ serverFull = Server er fuld
setSpawner = Changed spawner type to {0}
sheepMalformedColor = Misdannet farve.
shoutFormat = \u00a77[R\u00e5b]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
similarWarpExist = En warp med lignende tekst eksisterer allerede.
slimeMalformedSize = Misdannet st\u00f8rrelse.
soloMob = Den mob kan godt lide at v\u00e6re alene
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index a38ba3d6e..45e6a50d2 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -131,8 +131,12 @@ itemSold = \u00a77Verkauft f\u00fcr \u00a7c{0}\u00a77 ({1} Einheiten je {2})
itemSoldConsole = {0} verkauft {1} f\u00fcr \u00a77{2}\u00a77 ({3} Einheiten je {4})
itemSpawn = \u00a77Gebe {0}x {1}
itemsCsvNotLoaded = Konnte items.csv nicht laden.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
jailMessage = \u00a7cYou do the crime, you do the time.
jailNotExist = Dieses Gef\u00e4ngnis existiert nicht.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
jailSet = \u00a77Gef\u00e4ngnis {0} wurde erstellt.
jumpError = Das w\u00fcrde deinen Computer \u00fcberlasten.
kickDefault = Vom Server geworfen
@@ -239,6 +243,7 @@ possibleWorlds = \u00a77M\u00f6gliche Welten sind nummeriet von 0 bis {0}.
powerToolAir = Befehl kann nicht mit Luft verbunden werden.
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}.
@@ -265,6 +270,10 @@ serverFull = Server ist voll
setSpawner = Changed spawner type to {0}
sheepMalformedColor = Ung\u00fcltige Farbe.
shoutFormat = \u00a77[Schrei]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
similarWarpExist = Ein Warp-Punkt mit einem \u00e4hnlichen Namen existiert bereits.
slimeMalformedSize = Ung\u00fcltige Gr\u00f6sse.
soloMob = Das Monster m\u00f6chte allein sein.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 6f1809c05..25064cbc7 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -131,8 +131,12 @@ itemSold = \u00a77Sold for \u00a7c {0} \u00a77 ({1} items at {2} each)
itemSoldConsole = {0} sold {1} for \u00a77 {2} \u00a77 ({3} items at {4} each)
itemSpawn = \u00a77Giving {0} of {1}
itemsCsvNotLoaded = Could not load items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
jailMessage = \u00a7cYou do the crime, you do the time.
jailNotExist = That jail does not exist.
+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.
kickDefault = Kicked from server
@@ -239,6 +243,7 @@ possibleWorlds = \u00a77Possible worlds are the numbers 0 through {0}.
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.
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}.
@@ -265,6 +270,10 @@ serverFull = Server is full
setSpawner = Changed spawner type to {0}
sheepMalformedColor = Malformed color.
shoutFormat = \u00a77[Shout]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
similarWarpExist = A warp with a similar name already exists.
slimeMalformedSize = Malformed size.
soloMob = That mob likes to be alone
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index c564d0d76..a2793cdd7 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -131,8 +131,12 @@ itemSold = \u00a77Vendu pour \u00a7c {0} \u00a77 ({1} objet(s) \u00e0 {2} chacun
itemSoldConsole = {0} vendu {1} pour \u00a77 {2} \u00a77 ({3} objet(s) \u00e0 {4} chacun)
itemSpawn = \u00a77Donne {0} de {1}
itemsCsvNotLoaded = N''a pas pu charger items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
jailMessage = \u00a7cVous avez commis un crime, vous en payez le prix.
jailNotExist = Cette prison n''existe pas.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
jailSet = \u00a77La prison {0} a \u00e9t\u00e9 cr\u00e9\u00e9.
jumpError = \u00c7a aurait pu faire mal au cerveau de votre ordinateur.
kickDefault = Kick\u00e9 du serveur
@@ -239,6 +243,7 @@ possibleWorlds = \u00a77Les mondes possibles sont les nombres 0 par {0}.
powerToolAir = La commande ne peut pas \u00eatre attach\u00e9e \u00e0 l''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.
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}.
@@ -265,6 +270,10 @@ serverFull = Le serveur est plein.
setSpawner = Changed spawner type to {0}
sheepMalformedColor = Couleur mal form\u00e9e.
shoutFormat = \u00a77[Crie]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
similarWarpExist = Un warp avec un nom similaire existe d\u00e9j\u00e0.
slimeMalformedSize = Taille mal form\u00e9e.
soloMob = Ce monstre aime \u00eatre seul.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index cd214b5d4..4c96d800e 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -131,8 +131,12 @@ itemSold = \u00a77Verkocht voor \u00a7c {0} \u00a77 ({1} voorwerpen voor {2} 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.
jailNotExist = Die gevangenis bestaat niet.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
jailSet = \u00a77Gevangenis {0} is ingesteld
jumpError = Dat zou je computers hersenen beschadigen.
kickDefault = Gekicked van de server
@@ -239,6 +243,7 @@ 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}.
@@ -265,6 +270,10 @@ serverFull = Server is vol
setSpawner = Changed spawner type to {0}
sheepMalformedColor = Misvoormde kleur.
shoutFormat = \u00a77[Shout]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
similarWarpExist = Er bestaat al een warp met dezelfde naam.
slimeMalformedSize = Misvoormde grootte.
soloMob = Die mob is liever in zijn eentje
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 63e9b9aa8..2090e8484 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -61,7 +61,7 @@ commands:
aliases: [ecompass]
delhome:
description: Removes a home
- usage: /<command> [player] <name>
+ usage: /<command> [player:]<name>
aliases: [edelhome,remhome,rmhome,eremhome,ermhome]
deljail:
description: Removes a jail
@@ -120,7 +120,7 @@ commands:
aliases: [ehelpop]
home:
description: Teleport to your home.
- usage: /<command> <player>
+ usage: /<command> [player:][name]
aliases: [ehome]
ignore:
description: Ignore other players.
@@ -244,7 +244,7 @@ commands:
aliases: [esell]
sethome:
description: Set your home to your current location.
- usage: /<command>
+ usage: /<command> [[player:]name]
aliases: [esethome]
setjail:
description: Creates a jail where you specified named [jailname]
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 11:21:20 +0000