mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 23:18:17 +02:00
51cfcc88da
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: d352d965 SPIGOT-7221: Add Enemy (Entity) interface CraftBukkit Changes: 397c5557c SPIGOT-7221: Add Enemy (Entity) interface a0d3dfaf2 PR-1129: Fix state corruption while handling explosion damage on EntityComplexPart d67777f8b SPIGOT-7218: Player's outer layer of skin disappears after respawn
20 lines
902 B
Diff
20 lines
902 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Thu, 29 Dec 2022 11:16:05 -0500
|
|
Subject: [PATCH] Return 0 by default for FireworkMeta
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
|
index 907b016d3d7b4c756fa0ca75fb92d86b2e9bde1c..66e8863c0e60771719b8cf4f54a4e362943d7a42 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
|
@@ -389,7 +389,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
|
|
|
|
@Override
|
|
public int getPower() {
|
|
- return this.power;
|
|
+ return java.util.Objects.requireNonNullElse(this.power, 0); // Paper
|
|
}
|
|
|
|
@Override
|