Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-18 21:41:45 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1541: Fix firework launching

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-03-01 13:46:07 +11:00
parent 343d04f7cd
commit aedd9af144
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
View File

@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import com.google.common.base.Optional;
import net.minecraft.server.EntityFireworks; import net.minecraft.server.EntityFireworks;
import net.minecraft.server.ItemStack; import net.minecraft.server.ItemStack;
import net.minecraft.server.Items; import net.minecraft.server.Items;
@ -14,7 +15,6 @@ import org.bukkit.inventory.meta.FireworkMeta;
import java.util.Random; import java.util.Random;
public class CraftFirework extends CraftEntity implements Firework { public class CraftFirework extends CraftEntity implements Firework {
private static final int FIREWORK_ITEM_INDEX = 8;
private final Random random = new Random(); private final Random random = new Random();
private final CraftItemStack item; private final CraftItemStack item;
@ -26,7 +26,7 @@ public class CraftFirework extends CraftEntity implements Firework {
if (item == null) { if (item == null) {
item = new ItemStack(Items.FIREWORKS); item = new ItemStack(Items.FIREWORKS);
getHandle().getDataWatcher().register(EntityFireworks.FIREWORK_ITEM, item); getHandle().getDataWatcher().set(EntityFireworks.FIREWORK_ITEM, Optional.of(item));
} }
this.item = CraftItemStack.asCraftMirror(item); this.item = CraftItemStack.asCraftMirror(item);