From fe2ec0b3261f87c744f431699822bb878ca8922b Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 12 Dec 2025 21:38:26 -0800
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e5e2c50e Move scoreboard overrides to a separate field (#13378)
---
 gradle.properties                                           | 2 +-
 .../org/bukkit/craftbukkit/entity/CraftPlayer.java.patch    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b0aec368e..0ff9eb533 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
 
 mcVersion = 1.21.11
 apiVersion=1.21.11
-paperCommit = 4446f17f652d3ce56860f8c06d6746fa3c1853fc
+paperCommit = e5e2c50ed3f7a6e4dbe7451c089cb1ad3f77f8f9
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
index b8fca5a2a..57f7dc3d0 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -581,10 +_,15 @@
+@@ -582,10 +_,15 @@
  
      @Override
      public void setPlayerListName(String name) {
@@ -17,7 +17,7 @@
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-@@ -987,6 +_,80 @@
+@@ -988,6 +_,80 @@
          }
      }
  
@@ -98,7 +98,7 @@
      @Override
      public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) {
          Preconditions.checkArgument(source != null, "source must not be null");
-@@ -2494,6 +_,28 @@
+@@ -2495,6 +_,28 @@
      public float getWalkSpeed() {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }