mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
Date: Sat, 27 Apr 2024 20:56:17 -0700
|
||
|
Subject: [PATCH] General ItemMeta fixes
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
||
|
index 8e0dd4b7a7a25a8beb27b507047bc48d8227627c..88245d8704f4df3075d592a68a4715565e9eed8c 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
||
|
@@ -186,9 +186,13 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
|
||
|
}
|
||
|
|
||
|
List<FireworkExplosion> effects = new ArrayList<>();
|
||
|
- for (FireworkEffect effect : this.effects) {
|
||
|
- effects.add(CraftMetaFirework.getExplosion(effect));
|
||
|
+ // Paper start - fix NPE with effects list being null
|
||
|
+ if (this.effects != null) {
|
||
|
+ for (FireworkEffect effect : this.effects) {
|
||
|
+ effects.add(CraftMetaFirework.getExplosion(effect));
|
||
|
+ }
|
||
|
}
|
||
|
+ // Paper end
|
||
|
|
||
|
itemTag.put(CraftMetaFirework.FIREWORKS, new Fireworks(this.power, effects));
|
||
|
}
|