mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 04:32:11 -07:00
Updated Upstream (Bukkit/CraftBukkit)
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: 79e39671 SPIGOT-7034: Add methods for set/get instrument in Goat Horn CraftBukkit Changes: 4768df736 SPIGOT-7034: Add methods for set/get instrument in Goat Horn 941d7e954 SPIGOT-7225: FireworkMeta#getPower() can throw a NullPointerException for items with no power set
This commit is contained in:
@@ -1,19 +0,0 @@
|
||||
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
|
||||
@@ -0,0 +0,0 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
|
||||
|
||||
@Override
|
||||
public int getPower() {
|
||||
- return this.power;
|
||||
+ return java.util.Objects.requireNonNullElse(this.power, 0); // Paper
|
||||
}
|
||||
|
||||
@Override
|
Submodule work/Bukkit updated: d352d96500...79e3967192
Submodule work/CraftBukkit updated: 397c5557ca...4768df7366
Reference in New Issue
Block a user