From 2a816cef7b289c550a8c80cda53e67bfbd10a2e0 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Thu, 7 Feb 2013 08:43:07 +0200 Subject: [PATCH 1/5] try improve bed spawn handle dont act as if bed doesnt exist if its missing --- .../earth2me/essentials/commands/Commandhome.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index c7a5dcd87..c2a796857 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))); } From 63c7d4519a067b93569edd9fd2d411bbe6b2da89 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Thu, 7 Feb 2013 08:48:34 +0200 Subject: [PATCH 2/5] change bed spawn set message --- .../src/com/earth2me/essentials/EssentialsPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From fa8b8bec5a685cd94f12efce9900b176e2182f59 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 12 Feb 2013 22:45:54 +0000 Subject: [PATCH 3/5] fix typo in messages add new messages to messages.properties add new messages to messages_en.properties add new messages to messages_cs.properties add new messages to messages_da.properties add new messages to messages_de.properties add new messages to messages_es.properties add new messages to messages_fi.properties add new messages to messages_fr.properties add new messages to messages_it.properties add new messages to messages_nl.properties add new messages to messages_pl.properties add new messages to messages_pt.properties add new messages to messages_se.properties remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull remove color from bedNull --- .../src/com/earth2me/essentials/commands/Commandhome.java | 4 ++-- Essentials/src/messages.properties | 3 +++ Essentials/src/messages_cs.properties | 3 +++ Essentials/src/messages_da.properties | 3 +++ Essentials/src/messages_de.properties | 3 +++ Essentials/src/messages_en.properties | 3 +++ Essentials/src/messages_es.properties | 3 +++ Essentials/src/messages_fi.properties | 3 +++ Essentials/src/messages_fr.properties | 3 +++ Essentials/src/messages_it.properties | 3 +++ Essentials/src/messages_nl.properties | 3 +++ Essentials/src/messages_pl.properties | 3 +++ Essentials/src/messages_pt.properties | 3 +++ Essentials/src/messages_se.properties | 3 +++ 14 files changed, 41 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index c2a796857..a042e3032 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 } else { - throw new Exception(_("bedmissing")); + throw new Exception(_("bedMissing")); } } goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge); @@ -85,7 +85,7 @@ public class Commandhome extends EssentialsCommand } else { - homes.add(_("bednull")); + 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..1a971181d 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=\u00a74\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. From 0dc8980d329630646631835da865bbf493c835c3 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Sun, 10 Feb 2013 11:26:51 +0200 Subject: [PATCH 4/5] remove color from bedNull --- Essentials/src/messages_se.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties index 1a971181d..c29450f62 100644 --- a/Essentials/src/messages_se.properties +++ b/Essentials/src/messages_se.properties @@ -498,7 +498,7 @@ 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=\u00a74\u00a7mbed\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. From 56df6b36a58ee3526cc21fd87009b675139deb13 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 12 Feb 2013 22:56:17 +0000 Subject: [PATCH 5/5] Fix /give|/item descriptions for itemmeta. --- Essentials/src/plugin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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.