From 7d9c6fea6917045d89a559e1dcb65797f3e0b099 Mon Sep 17 00:00:00 2001
From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com>
Date: Sun, 19 May 2024 09:29:05 +0200
Subject: [PATCH] Fix firework rewriting in 1.20.3->.5 (#3860)

Makes the explosion tag optional like it is in 1.20.4 so the tooltip shows the correct duration when crafting a firework, also fixes the type used for Flight which is byte in 1.20.4
---
 .../rewriter/BlockItemPacketRewriter1_20_5.java          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
index d906ca951..78170ddf9 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -499,9 +499,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         final CompoundTag fireworksTag = tag.getCompoundTag("Fireworks");
         if (fireworksTag != null) {
             final ListTag<CompoundTag> explosionsTag = fireworksTag.getListTag("Explosions", CompoundTag.class);
-            if (explosionsTag != null) {
-                updateFireworks(data, fireworksTag, explosionsTag);
-            }
+            updateFireworks(data, fireworksTag, explosionsTag);
         }
 
         if (old.identifier() == 1085) {
@@ -1022,10 +1020,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
     }
 
     private void updateFireworks(final StructuredDataContainer data, final CompoundTag fireworksTag, final ListTag<CompoundTag> explosionsTag) {
-        final int flightDuration = fireworksTag.getInt("Flight");
+        final int flightDuration = fireworksTag.getByte("Flight");
         final Fireworks fireworks = new Fireworks(
             flightDuration,
-            explosionsTag.stream().limit(256).map(this::readExplosion).toArray(FireworkExplosion[]::new)
+            explosionsTag != null ? explosionsTag.stream().limit(256).
+                map(this::readExplosion).toArray(FireworkExplosion[]::new) : new FireworkExplosion[0]
         );
         data.set(StructuredDataKey.FIREWORKS, fireworks);
     }