From c4e5604ca8e4a36d24f4eaa90de7fee768fb60b7 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sat, 12 Jul 2025 17:55:22 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@76fb5060 Add vanilla error message to precondition for DialogBaseImpl (#12831)
PaperMC/Paper@fcfc6c3f Expose HexColor argument type (#12833)
PaperMC/Paper@4000fcc3 Fix typo in PluginBootstrap javadocs (#12821)
PaperMC/Paper@25d358cf [ci/skip] javadoc: Fix grammatical error for getState (#12817)
PaperMC/Paper@ba7c9826 Add missing Range annotations to dialog types
PaperMC/Paper@533d93c7 Don't consume anchor charge if loc changes (#12835)
---
 gradle.properties                                |  2 +-
 .../server/level/ServerPlayer.java.patch         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index cb36c473e..85c47d6b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.7-R0.1-SNAPSHOT
 
 mcVersion = 1.21.7
-paperCommit = 1bf6364b97de3202348df8b3c0c522cc54be5bbb
+paperCommit = 533d93c758e248207a5f0134ed51b83e0b07f472
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
index d5763330f..bd9d63b8b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -53,7 +53,7 @@
              Entity entity = damageSource.getEntity();
              if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
               !(entity instanceof Player player && !this.canHarmPlayer(player))
-@@ -1425,6 +_,7 @@
+@@ -1434,6 +_,7 @@
                  serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
                  // CraftBukkit end
@@ -61,7 +61,7 @@
                  this.setServerLevel(level);
                  this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
-@@ -1541,7 +_,7 @@
+@@ -1550,7 +_,7 @@
                              new AABB(vec3.x() - 8.0, vec3.y() - 5.0, vec3.z() - 8.0, vec3.x() + 8.0, vec3.y() + 5.0, vec3.z() + 8.0),
                              monster -> monster.isPreventingPlayerRest(this.level(), this)
                          );
@@ -70,7 +70,7 @@
                          return Either.left(Player.BedSleepingProblem.NOT_SAFE);
                      }
                  }
-@@ -1578,7 +_,19 @@
+@@ -1587,7 +_,19 @@
                      CriteriaTriggers.SLEPT_IN_BED.trigger(this);
                  });
                  if (!this.level().canSleepThroughNights()) {
@@ -91,7 +91,7 @@
                  }
  
                  this.level().updateSleepingPlayerList();
-@@ -1670,6 +_,7 @@
+@@ -1679,6 +_,7 @@
  
      @Override
      public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) {
@@ -99,7 +99,7 @@
          this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText));
      }
-@@ -1979,6 +_,26 @@
+@@ -1988,6 +_,26 @@
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
@@ -126,7 +126,7 @@
      @Override
      public void displayClientMessage(Component chatComponent, boolean actionBar) {
          this.sendSystemMessage(chatComponent, actionBar);
-@@ -2197,6 +_,20 @@
+@@ -2206,6 +_,20 @@
          );
      }
  
@@ -147,7 +147,7 @@
      public void sendSystemMessage(Component mesage) {
          this.sendSystemMessage(mesage, false);
      }
-@@ -2335,7 +_,67 @@
+@@ -2344,7 +_,67 @@
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -216,7 +216,7 @@
  
      public ServerStatsCounter getStats() {
          return this.stats;
-@@ -2963,4 +_,56 @@
+@@ -2972,4 +_,56 @@
          return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end