Merge pull request #454 from Riaku/master

move commandAntioch to extras

4 files changed, 28 insertions, 2 deletions

diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 718ce306b..cdc021857 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -507,5 +507,6 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 invalidIpAddress=\u00a74Invalid IP address
+ItemDatabaseResponse=\u00a7c{0}\u00a76- {1}\u00a76:{2}
 #, java-format
 Hello\ {0},\ how\ are\ you?=\u00a7fHello \u00a74{0}\u00a7f, how are you?
diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java
index 6cb9885f1..b00a0c53b 100644
--- a/Essentials/src/net/ess3/commands/Commanditemdb.java
+++ b/Essentials/src/net/ess3/commands/Commanditemdb.java
@@ -30,7 +30,8 @@ public class Commanditemdb extends EssentialsCommand
 		}
 		final Material itemType = itemStack.getType();
 		final int id = itemType.getId();
-		sender.sendMessage(itemStack.getType().toString() + "- " + id + ":" + Integer.toString(itemStack.getData().getData()));
+		final String data = Integer.toString(itemStack.getData().getData());
+		sender.sendMessage(_("ItemDatabaseResponse", itemStack.getType().toString(), id, data));
 		if (id != 0)
 		{
 			final int maxuses = itemType.getMaxDurability();
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 3dfe5bd22..779ed52ad 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -12,7 +12,7 @@ commands:
     usage: /<command>
     aliases: [eafk]
   antioch:
-    description: 'A little surprise for operators.'
+    description: A little surprise for operators.
     usage: /<command> [message]
     aliases: [eantioch,grenade,tnt,egrenade,etnt]
   back:
diff --git a/EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java b/EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java
new file mode 100644
index 000000000..dacb24c93
--- /dev/null
+++ b/EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java
@@ -0,0 +1,24 @@
+package net.ess3.extra.commands;
+
+import net.ess3.api.IUser;
+import net.ess3.commands.EssentialsCommand;
+import net.ess3.utils.LocationUtil;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.TNTPrimed;
+
+// This command has a theme message that only shows if you supply a parameter #EasterEgg
+public class Commandantioch extends EssentialsCommand
+{
+	public void run(final Server server, final IUser user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0)
+		{
+			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+		}		
+
+		final Location loc = LocationUtil.getTarget(user.getPlayer());
+		loc.getWorld().spawn(loc, TNTPrimed.class);
+	}
+}
\ No newline at end of file