diff options
| author | GunfighterJ <joseph.jenniges@gmail.com> | 2013-02-11 09:22:58 -0600 |
|---|---|---|
| committer | GunfighterJ <joseph.jenniges@gmail.com> | 2013-02-11 10:35:55 -0600 |
| commit | 2e29dabca705bdc2f082d7716a1c894231aa977b (patch) | |
| tree | a28402a46385b934ac1f97ccd5bc8213ca587f6e | |
| parent | ca117d2c554916bc005b5fb62254a401d7b0848a (diff) | |
| download | Essentials-2e29dabca705bdc2f082d7716a1c894231aa977b.tar Essentials-2e29dabca705bdc2f082d7716a1c894231aa977b.tar.gz Essentials-2e29dabca705bdc2f082d7716a1c894231aa977b.tar.lz Essentials-2e29dabca705bdc2f082d7716a1c894231aa977b.tar.xz Essentials-2e29dabca705bdc2f082d7716a1c894231aa977b.zip | |
Fix array index out of bounds on /firework fire
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandfirework.java | 25 | ||||
| -rw-r--r-- | Essentials/src/plugin.yml | 2 |
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. |