From 596a39c965b8de946708e3d96b8111188e35a0a1 Mon Sep 17 00:00:00 2001
From: Intelli <contact@intelli.software>
Date: Fri, 25 Feb 2022 19:34:23 -0700
Subject: [PATCH] Fixed all firework metadata not being correctly logged

---
 src/main/java/net/coreprotect/database/Rollback.java            | 2 ++
 .../java/net/coreprotect/utility/serialize/ItemMetaHandler.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/net/coreprotect/database/Rollback.java b/src/main/java/net/coreprotect/database/Rollback.java
index 995fd33..53375d5 100644
--- a/src/main/java/net/coreprotect/database/Rollback.java
+++ b/src/main/java/net/coreprotect/database/Rollback.java
@@ -1836,8 +1836,10 @@ public class Rollback extends Queue {
                         if (itemCount == 1) {
                             effectBuilder = FireworkEffect.builder();
                             for (Map<String, Object> fireworkData : map) {
+                                org.bukkit.FireworkEffect.Type type = (org.bukkit.FireworkEffect.Type) fireworkData.getOrDefault("type", org.bukkit.FireworkEffect.Type.BALL);
                                 boolean hasFlicker = (Boolean) fireworkData.get("flicker");
                                 boolean hasTrail = (Boolean) fireworkData.get("trail");
+                                effectBuilder.with(type);
                                 effectBuilder.flicker(hasFlicker);
                                 effectBuilder.trail(hasTrail);
                             }
diff --git a/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java b/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java
index 40e8bb2..bd20531 100644
--- a/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java
+++ b/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java
@@ -279,6 +279,7 @@ public class ItemMetaHandler {
         }
 
         Map<String, Object> hasCheck = new HashMap<>();
+        hasCheck.put("type", effect.getType());
         hasCheck.put("flicker", effect.hasFlicker());
         hasCheck.put("trail", effect.hasTrail());
         list.add(hasCheck);