Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-01 04:51:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #321 from GunfighterJ/patch-10

Browse Source 
Fix array index out of bounds on /firework fire
This commit is contained in:
KHobbits 2013-02-11 08:41:47 -08:00
commit 8ea0a152d4
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
View File

@ -85,11 +85,13 @@ public class Commandfirework extends EssentialsCommand
} }
stack.setItemMeta(fmeta); 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")) && user.isAuthorized("essentials.firework.fire"))
{ {
int amount = 1; int amount = 1;
boolean direction = false; boolean direction = false;
if (args.length > 1)
{
if (Util.isInt(args[1])) if (Util.isInt(args[1]))
{ {
final int serverLimit = ess.getSettings().getSpawnMobLimit(); final int serverLimit = ess.getSettings().getSpawnMobLimit();
@ -104,6 +106,7 @@ public class Commandfirework extends EssentialsCommand
{ {
direction = true; direction = true;
} }
}
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
{ {
Firework firework = (Firework)user.getWorld().spawnEntity(user.getLocation(), EntityType.FIREWORK); Firework firework = (Firework)user.getWorld().spawnEntity(user.getLocation(), EntityType.FIREWORK);

2
Essentials/src/plugin.yml
View File

@ -121,7 +121,7 @@ commands:
aliases: [efireball,fireskull,efireskull,fireentity,efireentity] aliases: [efireball,fireskull,efireskull,fireentity,efireentity]
firework: firework:
description: Allows you to modify a stack of fireworks 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] aliases: [efirework]
gamemode: gamemode:
description: Change player gamemode. description: Change player gamemode.