diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index fa8a39472..bbfc24392 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -442,7 +442,7 @@ public class EssentialsPlayerListener implements Listener if (player.isAuthorized("essentials.sethome.bed")) { player.setBedSpawnLocation(event.getClickedBlock().getLocation()); - player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); + player.sendMessage(_("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); } } break; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index c7a5dcd87..a042e3032 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -52,6 +52,10 @@ public class Commandhome extends EssentialsCommand user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND); throw new NoChargeException(); } + else + { + throw new Exception(_("bedMissing")); + } } goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge); } @@ -73,9 +77,16 @@ public class Commandhome extends EssentialsCommand } else { - if (bed != null && user.isAuthorized("essentials.home.bed")) + if (user.isAuthorized("essentials.home.bed")) { - homes.add(_("bed")); + if (bed != null) + { + homes.add(_("bed")); + } + else + { + homes.add(_("bedNull")); + } } user.sendMessage(_("homes", Util.joinList(homes))); } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 320fcd08b..151094259 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 2d00819cd..f72b5c5a8 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -501,5 +501,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 7e96d213a..bd79f240f 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index f5b64d830..614b24333 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 320fcd08b..151094259 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 59a36e995..33b2d8932 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 3a2d07236..3056c05bb 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 564e6c67a..359e6b604 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 49719f1de..1d167ed13 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 1110a960e..419812450 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index b34f234ea..9d3932861 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index e59428a1f..e0f5ece53 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -498,5 +498,8 @@ 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties index 364343416..c29450f62 100644 --- a/Essentials/src/messages_se.properties +++ b/Essentials/src/messages_se.properties @@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75\u00c3\u00a4r f\u00c3\u00b6r n\u00c3\u00a4rvarande bor 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 +bedNull=\u00a7mbed\u00a7r +bedMissing=\u00a74Your bed is either unset, missing or blocked. +bedSet=\u00a76Bed spawn set! kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 8a457659c..71ca7f626 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -137,7 +137,7 @@ commands: aliases: [coords,egetpos,position,eposition,whereami,ewhereami] give: description: Give a player an item. - usage: / [amount ...] + usage: / [amount [itemmeta...]] aliases: [egive] god: description: Enables your godly powers. @@ -177,7 +177,7 @@ commands: aliases: [einvsee] item: description: Spawn an item. - usage: / [amount ...] + usage: / [amount [itemmeta...]] aliases: [i,eitem] itemdb: description: Searches for an item.