From 8292b73f3098be405d181522361f056932ff84be Mon Sep 17 00:00:00 2001 From: feildmaster Date: Sun, 23 Dec 2012 17:06:26 -0600 Subject: [PATCH] Fix fireworks being short lived. Fixes BUKKIT-3291 --- .../java/org/bukkit/craftbukkit/entity/CraftFirework.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java index 1a576007d3..863078f8bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -16,6 +16,7 @@ import java.util.Random; public class CraftFirework extends CraftEntity implements Firework { private static final int FIREWORK_ITEM_INDEX = 8; + private final Random random = new Random(); private final CraftItemStack item; public CraftFirework(CraftServer server, EntityFireworks entity) { @@ -58,8 +59,7 @@ public class CraftFirework extends CraftEntity implements Firework { item.setItemMeta(meta); // Copied from EntityFireworks constructor, update firework lifetime/power - Random random = new Random(); - getHandle().b = 10 * meta.getPower() + random.nextInt(6) + random.nextInt(7); + getHandle().b = 10 * (1 + meta.getPower()) + random.nextInt(6) + random.nextInt(7); getHandle().getDataWatcher().h(FIREWORK_ITEM_INDEX); // Update }