From 0f495ae698c486fa65e434be705b24699c739bd0 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Sat, 28 Sep 2024 00:13:25 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@627cc64 Adjust HAProxy's existance to log for console masters (#11433)
PaperMC/Paper@01c4820 Call EntityDropItemEvent when a container item drops its contents (#11441)
PaperMC/Paper@9c76642 Deprecate for removal Block#isValidTool (#11439)
PaperMC/Paper@dd6d184 Remove redundant fillUsableCommands call (#11425)
PaperMC/Paper@f33611c fix ItemStack#removeEnchantments creating non-stackable items (#11442)
PaperMC/Paper@8f56db8 Add enchantWithLevels with tag specification (#11438)
PaperMC/Paper@b7ab22d Fix console completions on invalid commands (#7603)
---
 gradle.properties                                           | 2 +-
 ...ip-PlayerCommandSendEvent-if-there-are-no-listener.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e098959..4cfc3d3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=20ec62255da0374efed5026600321f715ad94282
+paperRef=b7ab22dee18865a9a3983103767a9caf46db4a3a
 
 org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/patches/server/0094-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0094-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
index dab7e3b..a1078fe 100644
--- a/patches/server/0094-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
+++ b/patches/server/0094-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index e4d658b43168dddf0957b8b71ba4202a788fbeb0..037a01f6e657289783f7ee66aa3a022310687f58 100644
+index 6ad2a538df3edcb8799aa89e7fe9cb4e15713ae0..6b2be7f529ceeb500018588319aa3944d9b4949d 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -506,6 +506,7 @@ public class Commands {
+@@ -500,6 +500,7 @@ public class Commands {
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
          // Paper end - Perf: Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API
@@ -48,7 +48,7 @@ index e4d658b43168dddf0957b8b71ba4202a788fbeb0..037a01f6e657289783f7ee66aa3a0223
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
-@@ -516,6 +517,7 @@ public class Commands {
+@@ -510,6 +511,7 @@ public class Commands {
              }
          }
          // CraftBukkit end