Add more items to Fireball command. Add /delay option to spawner

b04fa82be251608f829ff55e46d917b39a3fe7f3
2988db08cabac2848c85dec26aa53dcb033b41fb

2 files changed, 22 insertions, 1 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java
index 44dbb7493..1927bbbbe 100644
--- a/Essentials/src/net/ess3/commands/Commandfireball.java
+++ b/Essentials/src/net/ess3/commands/Commandfireball.java
@@ -29,6 +29,18 @@ public class Commandfireball extends EssentialsCommand
 			{
 				clazz = Egg.class;
 			}
+			else if(args[0].equalsIgnoreCase("snowball"))
+			{
+				clazz = Snowball.class;
+			}
+			else if(args[0].equalsIgnoreCase("expbottle"))
+			{
+				clazz = ThrownExpBottle.class;
+			}
+			else if(args[0].equalsIgnoreCase("large"))
+			{
+				clazz = LargeFireball.class;
+			}
 		}
 
 		final Player player = user.getPlayer();
diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java
index fe41256ff..8c4a375f0 100644
--- a/Essentials/src/net/ess3/commands/Commandspawner.java
+++ b/Essentials/src/net/ess3/commands/Commandspawner.java
@@ -45,9 +45,18 @@ public class Commandspawner extends EssentialsCommand
 			{
 				throw new Exception(_("unableToSpawnMob"));
 			}
+			int delay = 0;
+			if(args.length > 1 && Util.isInt(args[1]))
+			{
+				delay = Integer.parseInt(args[1]);
+			}
 			final Trade charge = new Trade("spawner-" + mob.getName().toLowerCase(Locale.ENGLISH), ess);
 			charge.isAffordableFor(user);
-			((CreatureSpawner)target.getBlock().getState()).setSpawnedType(mob);
+
+			CreatureSpawner spawner = ((CreatureSpawner)target.getBlock().getState());
+			spawner.setSpawnedType(mob);
+			spawner.setDelay(delay);
+
 			charge.charge(user);
 			user.sendMessage(_("setSpawner", mob.getName()));
 		}