From ffc98037e08d5bffb7a5d1a5ca277c5234dc089b Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Thu, 27 Mar 2025 15:38:48 -0400
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9b1798d6 Simplify custom payload handling (#12347)
---
 .../features/0004-Remove-vanilla-profiler.patch             | 6 +++---
 .../features/0075-Send-multiple-keep-alive-packets.patch    | 6 +++---
 gradle.properties                                           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch b/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch
index 157b6f0..edce915 100644
--- a/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch
+++ b/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch
@@ -1105,7 +1105,7 @@ index 3de65c4025be91d938a350c884975cb6edc234d3..c11150dada66888e5332ec88d153dea3
                  this.stopUsingItem();
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index e71c1a564e5d4ac43460f89879ff709ee685706f..2b059bff0d24b52b106a0af4b7e79818f385596e 100644
+index af75f1ca60dc01045f27cb550ac9e3deacf1a1cf..9133ede1cfac62d3ece698dae2de43039e3ca7d9 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -24,7 +24,6 @@ import net.minecraft.network.protocol.cookie.ServerboundCookieResponsePacket;
@@ -1116,7 +1116,7 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..2b059bff0d24b52b106a0af4b7e79818
  import org.slf4j.Logger;
  
  public abstract class ServerCommonPacketListenerImpl implements ServerCommonPacketListener, org.bukkit.craftbukkit.entity.CraftPlayer.TransferCookieConnection { // CraftBukkit
-@@ -233,7 +232,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -237,7 +236,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      }
  
      protected void keepConnectionAlive() {
@@ -1124,7 +1124,7 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..2b059bff0d24b52b106a0af4b7e79818
          long millis = Util.getMillis();
          // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings
          // This should effectively place the keepalive handling back to "as it was" before 1.12.2
-@@ -251,8 +249,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -255,8 +253,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
              }
          }
diff --git a/gale-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch b/gale-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch
index a8564c7..7f0fe13 100644
--- a/gale-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch
+++ b/gale-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 2b059bff0d24b52b106a0af4b7e79818f385596e..ea34bb4913e7357f5b76a64443f7e744abdf7b5e 100644
+index 9133ede1cfac62d3ece698dae2de43039e3ca7d9..060becd4c0b7aa399496ad70ba28cb3449cfaea3 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -40,6 +40,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -85,7 +85,7 @@ index 2b059bff0d24b52b106a0af4b7e79818f385596e..ea34bb4913e7357f5b76a64443f7e744
      }
  
      @Override
-@@ -236,6 +251,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -240,6 +255,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings
          // This should effectively place the keepalive handling back to "as it was" before 1.12.2
          final long elapsedTime = millis - this.keepAliveTime;
@@ -107,7 +107,7 @@ index 2b059bff0d24b52b106a0af4b7e79818f385596e..ea34bb4913e7357f5b76a64443f7e744
          if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // use vanilla's 15000L between keep alive packets
              if (this.keepAlivePending) {
                  if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
-@@ -249,6 +279,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -253,6 +283,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
              }
          }
diff --git a/gradle.properties b/gradle.properties
index 706af7a..3d3d955 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.4-R0.1-SNAPSHOT
 
 mcVersion=1.21.4
-paperRef=c467df95a29e6c3d42b7e6f49513e924f9ba2ece
+paperRef=9b1798d6438107fdf0d5939b79a8cf71f4d16e2c
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true