diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java index c4d0a6946..40bbba02d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java @@ -50,10 +50,10 @@ public class Commanddelhome extends EssentialsCommand { name = expandedArg[0]; } - //TODO: Think up a nice error message - /* - * if (name.equalsIgnoreCase("bed")) { throw new Exception("You cannot remove the vanilla home point"); } - */ + + + if (name.equalsIgnoreCase("bed")) { throw new Exception(_("invalidHomeName")); } + user.delHome(name.toLowerCase(Locale.ENGLISH)); sender.sendMessage(_("deleteHome", name)); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index 8b00ecc35..c7a5dcd87 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -75,7 +75,7 @@ public class Commandhome extends EssentialsCommand { if (bed != null && user.isAuthorized("essentials.home.bed")) { - homes.add("bed"); + homes.add(_("bed")); } user.sendMessage(_("homes", Util.joinList(homes))); } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 9982d4f76..97b5ae170 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index d1f6149e5..136dbbcd6 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -499,3 +499,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 344d81cc0..c85e02edf 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index dea191e4c..a664db0ba 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 15f07ee91..4789c0321 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 88f02a05c..e0ce7dde1 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 2ee333150..09b008bf5 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 593cf2ec8..2b9de10c7 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 13358e00e..94cd6c0b8 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index b67ed4d2e..f03225e8c 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index fb3dff7b6..ffcdb8fd3 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 1bb18549e..2caf8dcde 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c / userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties index 08d24ef80..393342966 100644 --- a/Essentials/src/messages_se.properties +++ b/Essentials/src/messages_se.properties @@ -496,3 +496,4 @@ messageTruncated=\u00a74Meddelandet har blivit f\u00c3\u00b6rkortat, f\u00c3\u00 userAFK=\u00a75{0} \u00a75\u00c3\u00a4r f\u00c3\u00b6r n\u00c3\u00a4rvarande borta och svarar kanske inte fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle +bed=\u00a7obed\u00a7r