From e52ed2c588b7aaeaa8ffc305bcda666e86b9bfaa Mon Sep 17 00:00:00 2001
From: byquanton <32410361+byquanton@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:49:06 +0100
Subject: [PATCH] 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
---
 ...Return-0-by-default-for-FireworkMeta.patch | 19 -------------------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 patches/server/Return-0-by-default-for-FireworkMeta.patch

diff --git a/patches/server/Return-0-by-default-for-FireworkMeta.patch b/patches/server/Return-0-by-default-for-FireworkMeta.patch
deleted file mode 100644
index 7a69764231..0000000000
--- a/patches/server/Return-0-by-default-for-FireworkMeta.patch
+++ /dev/null
@@ -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
diff --git a/work/Bukkit b/work/Bukkit
index d352d96500..79e3967192 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit d352d96500fbd215d06f4561f374faabb1c0b1fd
+Subproject commit 79e3967192566bce29eb6688fc3abafa69a2be24
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 397c5557ca..4768df7366 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 397c5557cac66a242573cec11a2966d812b710d2
+Subproject commit 4768df7366ef10e808b31e8b167b21913822f076