diff options
| author | md_5 <git@md-5.net> | 2016-11-18 10:11:19 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-18 10:11:19 +1100 |
| commit | 4bf2fc878208caea140b44d6a51bca0368d5a985 (patch) | |
| tree | 775cbca5c0a7abc89c18c4eb3882c8e63c831ae6 /src/main | |
| parent | 486ba9f4817aa786c3daef979e680a8d8c470605 (diff) | |
| download | craftbukkit-4bf2fc878208caea140b44d6a51bca0368d5a985.tar craftbukkit-4bf2fc878208caea140b44d6a51bca0368d5a985.tar.gz craftbukkit-4bf2fc878208caea140b44d6a51bca0368d5a985.tar.lz craftbukkit-4bf2fc878208caea140b44d6a51bca0368d5a985.tar.xz craftbukkit-4bf2fc878208caea140b44d6a51bca0368d5a985.zip | |
SPIGOT-2786: Restore some fireworks code lost in update
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java index e97037f6..99746b3c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -1,6 +1,8 @@ package org.bukkit.craftbukkit.entity; import net.minecraft.server.EntityFireworks; +import net.minecraft.server.ItemStack; +import net.minecraft.server.Items; import org.bukkit.Material; import org.bukkit.craftbukkit.CraftServer; @@ -18,7 +20,15 @@ public class CraftFirework extends CraftEntity implements Firework { public CraftFirework(CraftServer server, EntityFireworks entity) { super(server, entity); - this.item = CraftItemStack.asCraftMirror(getHandle().getDataWatcher().get(EntityFireworks.FIREWORK_ITEM)); + + ItemStack item = getHandle().getDataWatcher().get(EntityFireworks.FIREWORK_ITEM); + + if (item.isEmpty()) { + item = new ItemStack(Items.FIREWORKS); + getHandle().getDataWatcher().set(EntityFireworks.FIREWORK_ITEM, item); + } + + this.item = CraftItemStack.asCraftMirror(item); // Ensure the item is a firework... if (this.item.getType() != Material.FIREWORK) { |