From e141f680fd6bfbac1a6008008dd2010824602086 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sat, 30 Nov 2024 17:42:07 -0800
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9039c39 Add back discard policy
PaperMC/Paper@27e4ddc Fix item_model adapter, rename internal classes
---
 gradle.properties                                           | 2 +-
 .../server/0042-Skip-events-if-there-s-no-listeners.patch   | 6 +++---
 patches/server/0291-ItemStack-convenience-methods.patch     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 504c13c12..3b77b1820 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.3-R0.1-SNAPSHOT
 
 mcVersion = 1.21.3
-paperCommit = 47f207135044e8835c529561d0d0029f0ae3fba8
+paperCommit = 27e4ddcd067d4825eb01cb05d6975c46252eeafa
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0042-Skip-events-if-there-s-no-listeners.patch b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch
index 4dc7794a1..46a4769b0 100644
--- a/patches/server/0042-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 5f3669e3eb371d65dd27c37053d4bc5640d93774..bb82e6519e6f1a6a8d87fb6293681fe32b39a6a1 100644
+index 64bf4444ffba25cb40743a32267aa790ad1738f9..1210305bcfc8a1158dbdc3c21647502a01b138a3 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -511,6 +511,7 @@ public class Commands {
+@@ -515,6 +515,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
@@ -16,7 +16,7 @@ index 5f3669e3eb371d65dd27c37053d4bc5640d93774..bb82e6519e6f1a6a8d87fb6293681fe3
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
-@@ -521,6 +522,7 @@ public class Commands {
+@@ -525,6 +526,7 @@ public class Commands {
              }
          }
          // CraftBukkit end
diff --git a/patches/server/0291-ItemStack-convenience-methods.patch b/patches/server/0291-ItemStack-convenience-methods.patch
index 739eb4fa1..d60ec7fae 100644
--- a/patches/server/0291-ItemStack-convenience-methods.patch
+++ b/patches/server/0291-ItemStack-convenience-methods.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index bfddaa146c1bcb6a3fdd43773ec06f91a259b200..53929a8827e2cf93cff70aaa08b2646505052aed 100644
+index 78975412da0f0c2b802bfce6d30d56b26d8023e2..4ec6a07796023aab2f8f84f131f48108c235c852 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -660,4 +660,285 @@ public final class CraftItemStack extends ItemStack {
+@@ -658,4 +658,285 @@ public final class CraftItemStack extends ItemStack {
      }
  
      // Paper end - data component API