summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandfirework.java25
-rw-r--r--Essentials/src/plugin.yml2
2 files changed, 15 insertions, 12 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
index f476a1846..182028235 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
@@ -85,24 +85,27 @@ public class Commandfirework extends EssentialsCommand
}
stack.setItemMeta(fmeta);
}
- else if ((args[0].equalsIgnoreCase("fire") || (args[0].equalsIgnoreCase("p")))
+ else if ((args[0].equalsIgnoreCase("fire") || (args[0].equalsIgnoreCase("f")))
&& user.isAuthorized("essentials.firework.fire"))
{
int amount = 1;
boolean direction = false;
- if (Util.isInt(args[1]))
+ if (args.length > 1)
{
- final int serverLimit = ess.getSettings().getSpawnMobLimit();
- amount = Integer.parseInt(args[1]);
- if (amount > serverLimit)
+ if (Util.isInt(args[1]))
{
- amount = serverLimit;
- user.sendMessage(_("mobSpawnLimit"));
+ final int serverLimit = ess.getSettings().getSpawnMobLimit();
+ amount = Integer.parseInt(args[1]);
+ if (amount > serverLimit)
+ {
+ amount = serverLimit;
+ user.sendMessage(_("mobSpawnLimit"));
+ }
+ }
+ else
+ {
+ direction = true;
}
- }
- else
- {
- direction = true;
}
for (int i = 0; i < amount; i++)
{
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index dc48da260..f0b903f98 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -121,7 +121,7 @@ commands:
aliases: [efireball,fireskull,efireskull,fireentity,efireentity]
firework:
description: Allows you to modify a stack of fireworks
- usage: /<command> <<meta param>|power [amount]|clear|fire>
+ usage: /<command> <<meta param>|power [amount]|clear|fire [amount]>
aliases: [efirework]
gamemode:
description: Change player gamemode.