All the better to kick you with

(Pipe format for linebreak)

4 files changed, 15 insertions, 14 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
index 05e2b51c6..6bea234f4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
@@ -58,7 +58,7 @@ public class Commandban extends EssentialsCommand
 		String banReason;
 		if (args.length > 1)
 		{
-			banReason = _("banFormat", Util.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n")), senderName);
+			banReason = _("banFormat", Util.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n")), senderName);
 		}
 		else
 		{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
index d977055e2..206127b58 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
@@ -40,7 +40,7 @@ public class Commandkick extends EssentialsCommand
 		}
 
 		String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault");
-		kickReason = Util.replaceFormat(kickReason.replace("\\n", "\n"));
+		kickReason = Util.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n"));
 
 		target.kickPlayer(kickReason);
 		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
index 4fc0b20be..6944823f3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
@@ -18,7 +18,7 @@ public class Commandkickall extends EssentialsCommand
 	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		String kickReason = args.length > 0 ? getFinalArg(args, 0) : _("kickDefault");
-		kickReason = Util.replaceFormat(kickReason.replace("\\n", "\n"));
+		kickReason = Util.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n"));
 
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index b1ebf6ca0..b12ed72c3 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -205,17 +205,11 @@ player-commands:
 
 # Note: All items MUST be followed by a quantity!
 # All kit names should be lower case, and will be treated as lower in permissions/costs.
-# Syntax: - itemID[:DataValue] Amount [Enchantment:Level]..
+# Syntax: - itemID[:DataValue/Durability] Amount [Enchantment:Level].. [meta:value]...
+# Supported meta includes: name, lore, color, player, title, author, info
 # 'delay' refers to the cooldown between how often you can use each kit, measured in seconds.
 # For more information, visit http://wiki.ess3.net/wiki/Command_Reference/ICheat#kits
 kits:
-  dtools:
-    delay: 10
-    items:
-      - 277 1 digspeed:3 name:Dwarf lore:Diggy|Diggy|Hole
-      - 278 1 efficiency:1 durability:1 fortune:1 name:Gigadrill lore:The_drill_that_pierces|the_heavens
-      - 298 1 color:255|0|0
-      - 279:780 1
   tools:
     delay: 10
     items:
@@ -223,14 +217,21 @@ kits:
       - 273 1
       - 274 1
       - 275 1
+  dtools:
+    delay: 600
+    items:
+      - 278 1 efficiency:1 durability:1 fortune:1 name:Gigadrill lore:The_drill_that_pierces|the_heavens
+      - 277 1 digspeed:3 name:Dwarf lore:Diggy|Diggy|Hole
+      - 298 1 color:255|255|255 name:Top_hat lore:Good_day,_Good_day
+      - 279:780 1
   notch:
-    delay: 1000    
+    delay: 6000
     items:
       - 397:3 1 player:Notch
   color:
-    delay: 1000    
+    delay: 6000
     items:
-      - 387 1 title:Colors author:KHobbits lore:Ingame_color_codes info:Colors
+      - 387 1 title:Book_o_Colors author:KHobbits lore:Ingame_color_codes info:Colors
 
 # Essentials Sign Control
 # See http://wiki.ess3.net/wiki/Sign_Tutorial for instructions on how to use these.