Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@358e72ec Remove simplify remote item matching stuff for now PaperMC/Paper@04ffca0b Also remove CraftPlayer methods
2025-05-09 19:43:20 -07:00 · 2025-05-09 19:43:20 -07:00 · 603c7557ba
commit 603c7557ba
parent 9d0aa8ebde
7 changed files with 28 additions and 28 deletions
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.4-R0.1-SNAPSHOT-mojmap.jar" />
+    <option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.5-R0.1-SNAPSHOT-mojmap.jar" />
    <option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
    <option name="ALTERNATIVE_JRE_PATH" />
@ -8,4 +8,4 @@
      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createMojmapPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
    </method>
  </configuration>
-</component>
+</component>
--- 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 = d2ad2e668d2fdd0bd3f49362b244f37e1f5744f3
+paperCommit = 04ffca0b6ba65b0c711ffc3ac592c2302a48c0a9

 org.gradle.configuration-cache = true
 org.gradle.caching = true
--- a/purpur-server/minecraft-patches/features/0001-Ridables.patch
+++ b/purpur-server/minecraft-patches/features/0001-Ridables.patch
@ -42,10 +42,10 @@ index f3f53791d4c5532434abc281a5798ee0e2653da2..56eabc55203756461fc679837b55b30a
     @Override
     public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index a7043588459defe8d47db011bab81403321319a0..bf673320ac4068550b54d64ace82a0f7278ed4d9 100644
+index 5ced523477c2b86e2b46182a77a9d991cf4cdd1f..f55dc4affffd495b4c02b77c8a60f172c1c6cf79 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -799,6 +799,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -792,6 +792,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
         this.trackEnteredOrExitedLavaOnVehicle();
         this.updatePlayerAttributes();
         this.advancements.flushDirty(this, true);
--- a/purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch
+++ b/purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index bf673320ac4068550b54d64ace82a0f7278ed4d9..ac6c8d1961bce62f1b8bd84908a6f343f2af21ae 100644
+index f55dc4affffd495b4c02b77c8a60f172c1c6cf79..47a6a607513c97910c7d57e8fb4862f6de74f9ac 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1199,6 +1199,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1192,6 +1192,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
         } else {
             // Purpur start - Add boat fall damage config
             if (damageSource.is(net.minecraft.tags.DamageTypeTags.IS_FALL)) {
--- 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
@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -427,6 +_,10 @@
+@@ -420,6 +_,10 @@
     public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
     public @Nullable String clientBrandName = null; // Paper - Brand support
     public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@ -11,7 +11,7 @@
 
     // Paper start - rewrite chunk system
     private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -560,6 +_,10 @@
+@@ -553,6 +_,10 @@
         this.respawnConfig = compound.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null);
         this.spawnExtraParticlesOnFall = compound.getBooleanOr("spawn_extra_particles_on_fall", false);
         this.raidOmenPosition = compound.read("raid_omen_position", BlockPos.CODEC).orElse(null);
@ -22,7 +22,7 @@
     }
 
     @Override
-@@ -577,6 +_,9 @@
+@@ -570,6 +_,9 @@
         compound.storeNullable("raid_omen_position", BlockPos.CODEC, this.raidOmenPosition);
         this.saveEnderPearls(compound);
         this.getBukkitEntity().setExtraData(compound); // CraftBukkit
@ -32,7 +32,7 @@
     }
 
     private void saveParentVehicle(CompoundTag tag) {
-@@ -1070,6 +_,7 @@
+@@ -1063,6 +_,7 @@
             // Paper - moved up to sendClientboundPlayerCombatKillPacket()
             sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent
             Team team = this.getTeam();
@ -40,7 +40,7 @@
             if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
                 this.server.getPlayerList().broadcastSystemMessage(deathMessage, false);
             } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
-@@ -1176,6 +_,13 @@
+@@ -1169,6 +_,13 @@
         if (this.isInvulnerableTo(level, damageSource)) {
             return false;
         } else {
@ -54,7 +54,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))
-@@ -1402,6 +_,7 @@
+@@ -1395,6 +_,7 @@
                 serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                 this.unsetRemoved();
                 // CraftBukkit end
@ -62,7 +62,7 @@
                 this.setServerLevel(level);
                 this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
                 this.connection.resetPosition();
-@@ -1519,7 +_,7 @@
+@@ -1512,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.serverLevel(), this)
                         );
@ -71,7 +71,7 @@
                         return Either.left(Player.BedSleepingProblem.NOT_SAFE);
                     }
                 }
-@@ -1556,7 +_,19 @@
+@@ -1549,7 +_,19 @@
                     CriteriaTriggers.SLEPT_IN_BED.trigger(this);
                 });
                 if (!this.serverLevel().canSleepThroughNights()) {
@ -92,7 +92,7 @@
                 }
 
                 ((ServerLevel)this.level()).updateSleepingPlayerList();
-@@ -1648,6 +_,7 @@
+@@ -1641,6 +_,7 @@
 
     @Override
     public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) {
@ -100,7 +100,7 @@
         this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos()));
         this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText));
     }
-@@ -1950,6 +_,26 @@
+@@ -1943,6 +_,26 @@
         this.lastSentExp = -1; // CraftBukkit - Added to reset
     }
 
@ -127,7 +127,7 @@
     @Override
     public void displayClientMessage(Component chatComponent, boolean actionBar) {
         this.sendSystemMessage(chatComponent, actionBar);
-@@ -2167,6 +_,20 @@
+@@ -2160,6 +_,20 @@
         );
     }
 
@ -148,7 +148,7 @@
     public void sendSystemMessage(Component mesage) {
         this.sendSystemMessage(mesage, false);
     }
-@@ -2305,7 +_,67 @@
+@@ -2298,7 +_,67 @@
 
     public void resetLastActionTime() {
         this.lastActionTime = Util.getMillis();
@ -217,7 +217,7 @@
 
     public ServerStatsCounter getStats() {
         return this.stats;
-@@ -2933,4 +_,56 @@
+@@ -2926,4 +_,56 @@
         return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
     }
     // CraftBukkit end
--- a/purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch
+++ b/purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch
@ -29,10 +29,10 @@ index db183796391e90c12958096eb0099308d8647781..f7d2c10038b1bd7af4cf54984b3c0c9f
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1450500f1500e6dbf54b8a496a788a0aae2ed1bc..09fc84319df0adb741dc29092ae33768878c8676 100644
+index 382c20eb62a2619b3f2a68f422f5e704d83e6a80..07c45bce5f3ceea897b9453a2c1568cdb2479560 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1434,6 +1434,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1433,6 +1433,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         // Paper start - Teleport passenger API
         // Don't allow teleporting between worlds while keeping passengers
         if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
@ -40,7 +40,7 @@ index 1450500f1500e6dbf54b8a496a788a0aae2ed1bc..09fc84319df0adb741dc29092ae33768
             return false;
         }
 
-@@ -1455,6 +1456,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1454,6 +1455,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         }
 
         if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
--- 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
-@@ -612,10 +_,15 @@
+@@ -611,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 : (List<ServerPlayer>) this.server.getHandle().players) {
             if (player.getBukkitEntity().canSee(this)) {
-@@ -2723,6 +_,28 @@
+@@ -2722,6 +_,28 @@
         return this.getHandle().getAbilities().walkingSpeed * 2f;
     }
 
@ -46,9 +46,9 @@
     private void validateSpeed(float value) {
         Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
     }
-@@ -3585,4 +_,76 @@
-     public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) {
-         this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck;
+@@ -3568,4 +_,76 @@
+     public void setDeathScreenScore(final int score) {
+         getHandle().setScore(score);
     }
 +
 +    // Purpur start - Purpur client support