From f2f682fb483131357e72ebaa4958e2c8aad79678 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 18 Apr 2025 16:42:41 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a55345f9 Add support for deserializing manually deserialized items, also add caller note
PaperMC/Paper@2948eb29 Mitigate an issue when loading a spigot config with null spam exclusion entries
PaperMC/Paper@6c2b0378 Use correct saved data key for maps
PaperMC/Paper@89cdcba5 [ci/skip] Replace wiki mention for BlockType#isOccluding (#12446)
---
 gradle.properties                                               | 2 +-
 .../org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e9fd97ac7..af35ce9d7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.5-R0.1-SNAPSHOT
 
 mcVersion = 1.21.5
-paperCommit = c0bd5688b53672eeeb63ed19ec76af2e2dc629b9
+paperCommit = 89cdcba5730ae2197b32788f8c3bf1aa9f472531
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
index d622f147d..98c5c72fa 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -484,7 +_,7 @@
+@@ -485,7 +_,7 @@
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {