Merge branch '2.9' of https://github.com/essentials/Essentials.git into 2.9

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;

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,10 +77,17 @@ public class Commandhome extends EssentialsCommand
 			}
 			else
 			{
-				if (bed != null  && user.isAuthorized("essentials.home.bed"))
+				if (user.isAuthorized("essentials.home.bed"))
+				{
+					if (bed != null)
 					{
 						homes.add(_("bed"));
 					}
+					else
+					{
+						homes.add(_("bedNull"));
+					}
+				}
 				user.sendMessage(_("homes", Util.joinList(homes)));
 			}
 		}

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

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:<color> [fade:<color>] [shape:<shape>] [effect:<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. 

Essentials/src/plugin.yml

@@ -137,7 +137,7 @@ commands:
     aliases: [coords,egetpos,position,eposition,whereami,ewhereami]
   give:
     description: Give a player an item.
-    usage: /<command> <player> <item|numeric> [amount <enchantmentname[:level]> ...]
+    usage: /<command> <player> <item|numeric> [amount [itemmeta...]]
     aliases: [egive]
   god:
     description: Enables your godly powers.
@@ -177,7 +177,7 @@ commands:
     aliases: [einvsee]
   item:
     description: Spawn an item.
-    usage: /<command> <item|numeric> [amount <enchantmentname[:level]> ...]
+    usage: /<command> <item|numeric> [amount [itemmeta...]]
     aliases: [i,eitem]
   itemdb:
     description: Searches for an item.