Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-18 09:26:08 +02:00
Code Issues Projects Releases Wiki Activity

Now it adds the right firework command

Browse Source
This commit is contained in:
GunfighterJ 2013-01-16 20:40:29 -06:00
parent 214d9414da
commit 8e663b53ce
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@ import org.bukkit.DyeColor;
import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Firework;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.inventory.meta.FireworkMeta;
@ -57,7 +59,6 @@ public class Commandfirework extends EssentialsCommand
{ {
fmeta.clearEffects(); fmeta.clearEffects();
stack.setItemMeta(fmeta); stack.setItemMeta(fmeta);
user.setItemInHand(stack);
} }
else else
{ {
@ -66,6 +67,8 @@ public class Commandfirework extends EssentialsCommand
FireworkEffect.Type finalEffect = null; FireworkEffect.Type finalEffect = null;
boolean valid = false; boolean valid = false;
boolean fire = false;
int amount = 1;
for (String arg : args) for (String arg : args)
{ {
final String[] split = splitPattern.split(arg, 2); final String[] split = splitPattern.split(arg, 2);
@ -151,13 +154,44 @@ public class Commandfirework extends EssentialsCommand
user.sendMessage(_("invalidFireworkFormat", split[1], split[0])); user.sendMessage(_("invalidFireworkFormat", split[1], split[0]));
} }
} }
if ((split[0].equalsIgnoreCase("fire") || split[0].equalsIgnoreCase("f")) && user.isAuthorized("essentials.firework.fire"))
{
fire = true;
try
{
amount = Integer.parseInt(split[1]);
int serverLimit = ess.getSettings().getSpawnMobLimit();
if(amount > serverLimit)
{
amount = serverLimit;
user.sendMessage(_("mobSpawnLimit"));
}
}
catch (NumberFormatException e)
{
amount = 1;
}
}
} }
if (valid) if (valid)
{ {
final FireworkEffect effect = builder.build(); if (fire)
fmeta.addEffect(effect); {
stack.setItemMeta(fmeta); for (int i = 0; i < amount; i++ )
user.setItemInHand(stack); {
Firework firework = (Firework)user.getWorld().spawnEntity(user.getLocation(), EntityType.FIREWORK);
FireworkMeta ffmeta = firework.getFireworkMeta();
ffmeta.addEffect(builder.build());
ffmeta.setPower(fmeta.getPower());
firework.setFireworkMeta(ffmeta);
}
}
else
{
final FireworkEffect effect = builder.build();
fmeta.addEffect(effect);
stack.setItemMeta(fmeta);
}
} }
else else
{ {
@ -177,4 +211,4 @@ public class Commandfirework extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
} }
} }