Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
02fbcbc Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079)
2641b91 Also deobfuscate secondary stacktraces in crash reports (#6078)
cc063e1 Fix incorrect variable usage in per-player mob spawning patch (#6077)

Tuinity Changes:
4867bfb Use correct y value for snow/ice formation
361be02 Update paper

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17-R0.1-SNAPSHOT
 mcVersion = 1.17
 packageVersion = 1_17_R1
 
-paperCommit = 6fd92758670a4c38ceb1b4dc6ed671547185f414
+paperCommit = cc063e1f09c116c9fc9786b40f7c36577a6a7264
 
 org.gradle.parallel = true
 org.gradle.vfs.watch = false

patches/server/0001-Tuinity-Server-Changes.patch

@@ -10806,7 +10806,7 @@ index 9fe60d058ea1702930981dbd06093dc594e6bf8e..2dd5909a08a8d4bc250b36d297ef9f3f
                  }
              }).exceptionally((throwable) -> {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7f7bc04a30a0422b2d589adb488082c0aa5326dc..1430411a6f7ef3730d87c022774d7d623f2f415f 100644
+index 6ed95a0cff3e9c874f14bc90283f750e15765c67..c44faf838c0bc7da480afe0f5ccedcaf8d0fea91 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -103,6 +103,7 @@ import org.apache.logging.log4j.LogManager;
@@ -12218,7 +12218,7 @@ index 44aa0c4ec6f0e4df2541c74fa7de852dae59bda5..a00627e0fa38632449042f59c053b4da
                              if (flag2) {
                                  packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.isOnGround());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e0878dcaa224 100644
+index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..a83b4e9b6b5bd6a57d4bc2f1cdc78ffb7e7d2fdd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -115,6 +115,7 @@ import net.minecraft.world.level.block.EntityBlock;
@@ -12513,7 +12513,7 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * paperConfig.skeleHorseSpawnChance && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
-@@ -729,64 +915,76 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -729,64 +915,78 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          }
  
          gameprofilerfiller.popPush("iceandsnow");
@@ -12523,7 +12523,7 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
 +         if (!this.paperConfig.disableIceAndSnow && this.randomTickRandom.nextInt(16) == 0) { // Paper - Disable ice and snow // Paper - optimise random ticking
 +            // Paper start - optimise chunk ticking
 +            this.getRandomBlockPosition(j, 0, k, 15, blockposition);
-+            int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15);
++            int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 +            int downY = normalY - 1;
 +            blockposition.setY(normalY);
 +            // Paper end
@@ -12547,9 +12547,11 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
 -                BlockState iblockdata = this.getBlockState(blockposition1);
 +                blockposition.setY(downY); // Paper
 +                BlockState iblockdata = this.getBlockState(blockposition); // Paper
++                blockposition.setY(normalY); // Paper
                  Biome.Precipitation biomebase_precipitation = this.getBiome(blockposition).getPrecipitation();
  
 -                if (biomebase_precipitation == Biome.Precipitation.RAIN && biomebase.isColdEnoughToSnow(blockposition1)) {
++                blockposition.setY(downY); // Paper
 +                if (biomebase_precipitation == Biome.Precipitation.RAIN && biomebase.isColdEnoughToSnow(blockposition)) { // Paper
                      biomebase_precipitation = Biome.Precipitation.SNOW;
                  }
@@ -12622,7 +12624,7 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
          timings.chunkTicksBlocks.stopTiming(); // Paper
          gameprofilerfiller.pop();
      }
-@@ -912,7 +1110,26 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -912,7 +1112,26 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
  
      }
  
@@ -12649,7 +12651,7 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
-@@ -953,7 +1170,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -953,7 +1172,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          }
  
          // } finally { timer.stopTiming(); } // Paper - timings - move up
@@ -12664,7 +12666,7 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
      }
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
-@@ -1245,9 +1468,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1245,9 +1470,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          // Spigot Start
          for (BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
@@ -12680,10 +12682,10 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e087
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 935b22199ebdf84db591f8442e0506d8fcc92e02..217af30c81438836864312e125cf512b491a3ab4 100644
+index a0acaac510aa2206a5c58f2b7aafdbc2bdf7a3dd..0da2dbeba93d428a035872e05177ed3fc29acf9b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -255,7 +255,7 @@ public class ServerPlayer extends Player {
+@@ -260,7 +260,7 @@ public class ServerPlayer extends Player {
  
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -12692,7 +12694,7 @@ index 935b22199ebdf84db591f8442e0506d8fcc92e02..217af30c81438836864312e125cf512b
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
  
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
-@@ -418,7 +418,7 @@ public class ServerPlayer extends Player {
+@@ -423,7 +423,7 @@ public class ServerPlayer extends Player {
  
                  if (blockposition1 != null) {
                      this.moveTo(blockposition1, 0.0F, 0.0F);
@@ -12701,7 +12703,7 @@ index 935b22199ebdf84db591f8442e0506d8fcc92e02..217af30c81438836864312e125cf512b
                          break;
                      }
                  }
-@@ -426,7 +426,7 @@ public class ServerPlayer extends Player {
+@@ -431,7 +431,7 @@ public class ServerPlayer extends Player {
          } else {
              this.moveTo(blockposition, 0.0F, 0.0F);
  
@@ -12710,7 +12712,7 @@ index 935b22199ebdf84db591f8442e0506d8fcc92e02..217af30c81438836864312e125cf512b
                  this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
              }
          }
-@@ -1557,6 +1557,18 @@ public class ServerPlayer extends Player {
+@@ -1562,6 +1562,18 @@ public class ServerPlayer extends Player {
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }
@@ -14480,7 +14482,7 @@ index 17281575ff83bbf1e720335619a78a6d0a0e5077..38753e10b1597a2f3bd2cde208c6e30b
  
      public boolean noSave() {
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 55b937f802ee7066cb13b9a497932038b2905ff0..b2329de658df71ce03a6fe0c41c02997afdf868f 100644
+index 31fbcf6a35b902ce80c0a5a23dabb8ec3d8cbdfc..0059f0488acc22ebddc2faf4c5879f9f0c24fd14 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -262,7 +262,7 @@ public final class NaturalSpawner {

patches/server/0005-Ridables.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 009febf8fccbfc9a638f018f921ebd9ec9068196..73e52022d27f59278b743c7765323f94a2c11d0e 100644
+index b01d7da333bac7820e42b6f645634a15ef88ae4f..30a4b80eacf76ad7f0a48b79bcf01b752c0af48a 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -41,6 +41,12 @@ public class BlockPos extends Vec3i {
@@ -34,7 +34,7 @@ index 4cc099b469a7554e381a6f7aceb686a94f7d6605..06177ec182d79cd101da9cd43a841656
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a4546a80b0d1fde8c4f92fea575745b1352d95b0..004bdf930769974ed02c68b8939af8e96bad88a7 100644
+index a83b4e9b6b5bd6a57d4bc2f1cdc78ffb7e7d2fdd..26c39cb0cd5e3c22825067f0d0d439c1044955a2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -205,6 +205,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -46,10 +46,10 @@ index a4546a80b0d1fde8c4f92fea575745b1352d95b0..004bdf930769974ed02c68b8939af8e9
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 217af30c81438836864312e125cf512b491a3ab4..4935937ec8da9979b64e1445f74c38cc5f49eec1 100644
+index 0da2dbeba93d428a035872e05177ed3fc29acf9b..56a60f26695cc888ee3f1f394f7d6108a3426071 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -663,6 +663,15 @@ public class ServerPlayer extends Player {
+@@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
          }
  
          this.advancements.flushDirty(this);
@@ -65,7 +65,7 @@ index 217af30c81438836864312e125cf512b491a3ab4..4935937ec8da9979b64e1445f74c38cc
      }
  
      public void doTick() {
-@@ -2379,4 +2388,6 @@ public class ServerPlayer extends Player {
+@@ -2384,4 +2393,6 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -73,7 +73,7 @@ index 217af30c81438836864312e125cf512b491a3ab4..4935937ec8da9979b64e1445f74c38cc
 +
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9dc5c82ea1d497174d288000f9f1ccaabbcb4a18..86159b0fcf33b70310f060962ab37cd6f05bf642 100644
+index f78119970da27ef66a9d9093e2e42ce129d4cf31..17a6857f5ee70120d664e46426f739ef2dae0a0a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2427,6 +2427,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -4526,7 +4526,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b
  
      Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1d76057b1b2dc9f0fc8e3fe5a5f6bfee23128007..f7c46b8173d30192853c875675a1ed0f59170b34 100644
+index fcf5f32c32eb17f7580b3c8c9190e36725f793ad..d92812cb334b590b728afb828dae61da483d8d56 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -154,4 +154,9 @@ public class PurpurConfig {

patches/server/0011-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4935937ec8da9979b64e1445f74c38cc5f49eec1..cf7945ec299ebbef1d5bb0319f0795b47987bb1a 100644
+index 56a60f26695cc888ee3f1f394f7d6108a3426071..4713ca7eaa178916508476472a2ca899c6587dc2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1927,8 +1927,58 @@ public class ServerPlayer extends Player {
+@@ -1932,8 +1932,58 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -68,7 +68,7 @@ index 4935937ec8da9979b64e1445f74c38cc5f49eec1..cf7945ec299ebbef1d5bb0319f0795b4
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86159b0fcf33b70310f060962ab37cd6f05bf642..af0c7bbce7641f5aa659abb440a6cd6f57019ede 100644
+index 17a6857f5ee70120d664e46426f739ef2dae0a0a..210b774eae5d76823e171016e9e6b706e8da4f07 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -391,6 +391,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -177,7 +177,7 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 727d33bd76a3d10f2bbfb07c18fe74860a34f2f7..58486dcc2b17e64e09f428b5fd0b771646ac09b0 100644
+index 0373f3fb256d796c090a3eddcf6e2be0ce25ec16..d35285b58b7141f2e9f438331faf566dc293cc63 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -156,8 +156,16 @@ public class PurpurConfig {

patches/server/0019-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d289bea83f6 100644
+index 4713ca7eaa178916508476472a2ca899c6587dc2..44b0e610fa2eb5f73a74bfadefc3f58bd20d6f6d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
+@@ -338,6 +338,7 @@ public class ServerPlayer extends Player {
          this.bukkitPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -16,7 +16,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
      }
      // Paper start - Chunk priority
      public BlockPos getPointInFront(double inFront) {
-@@ -974,6 +975,12 @@ public class ServerPlayer extends Player {
+@@ -979,6 +980,12 @@ public class ServerPlayer extends Player {
  
      }
  
@@ -29,7 +29,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -981,7 +988,7 @@ public class ServerPlayer extends Player {
+@@ -986,7 +993,7 @@ public class ServerPlayer extends Player {
          } else {
              boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
  
@@ -38,7 +38,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
                  return false;
              } else {
                  if (source instanceof EntityDamageSource) {
-@@ -1156,6 +1163,7 @@ public class ServerPlayer extends Player {
+@@ -1161,6 +1168,7 @@ public class ServerPlayer extends Player {
              }
              // Paper end
  
@@ -46,7 +46,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
              return this;
          }
      }
-@@ -2390,8 +2398,16 @@ public class ServerPlayer extends Player {
+@@ -2395,8 +2403,16 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
@@ -65,7 +65,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
      @Override
      public Scoreboard getScoreboard() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022a62dfdaf 100644
+index 210b774eae5d76823e171016e9e6b706e8da4f07..550ff06264aa4fffdd9b9291efec121ac034d963 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1938,6 +1938,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0046-Signs-allow-color-codes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bc7c87bf1d2f4e6eac9b094bfe111d289bea83f6..eeec7eeb8c4ae0152e028e7a9859310f7351c313 100644
+index 44b0e610fa2eb5f73a74bfadefc3f58bd20d6f6d..ee251b0081703af7fee71caaba2ff7eba9f2328c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1459,6 +1459,7 @@ public class ServerPlayer extends Player {
+@@ -1464,6 +1464,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void openTextEdit(SignBlockEntity sign) {
@@ -17,7 +17,7 @@ index bc7c87bf1d2f4e6eac9b094bfe111d289bea83f6..eeec7eeb8c4ae0152e028e7a9859310f
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index db8a8e81054e91161d43515fb19ab0106e9da1d0..3def323a4beabae4fffeda80d44c8f6fbc0535ae 100644
+index 8bcc80f2dabbc43b2f0970f53002f19e565d9b9e..56c8432a7c9f189f8afcd1001eb029c00d06e366 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3078,11 +3078,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0048-Minecart-settings-and-WASD-controls.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eeec7eeb8c4ae0152e028e7a9859310f7351c313..056b679cab7fe660d4a9b8bf782674fb210dd8bb 100644
+index ee251b0081703af7fee71caaba2ff7eba9f2328c..0cba5ac1f1d1c711704cd129084004ba52993534 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -986,6 +986,7 @@ public class ServerPlayer extends Player {
+@@ -991,6 +991,7 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

patches/server/0050-Players-should-not-cram-to-death.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 056b679cab7fe660d4a9b8bf782674fb210dd8bb..288d8e687f26c8f9757db055751dded6025117d5 100644
+index 0cba5ac1f1d1c711704cd129084004ba52993534..30db21164b63d72b9bf6be38867cdcfdbd3c702b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1436,7 +1436,7 @@ public class ServerPlayer extends Player {
+@@ -1441,7 +1441,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {

patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 288d8e687f26c8f9757db055751dded6025117d5..beb3901487525086eb3833ae51587d15c0a06036 100644
+index 30db21164b63d72b9bf6be38867cdcfdbd3c702b..8d427389756f173264da9d0da7b413763c41842a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2457,5 +2457,25 @@ public class ServerPlayer extends Player {
+@@ -2462,5 +2462,25 @@ public class ServerPlayer extends Player {
      }
      // CraftBukkit end
  

patches/server/0131-Add-boat-fall-damage-config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index beb3901487525086eb3833ae51587d15c0a06036..c0d2d56fe401f4a5b2ebe67b98bac99e98d0951e 100644
+index 8d427389756f173264da9d0da7b413763c41842a..269e422ea2860979bf08c9a280d17b165f456e93 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -986,7 +986,16 @@ public class ServerPlayer extends Player {
+@@ -991,7 +991,16 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

patches/server/0155-Fix-stuck-in-portals.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c0d2d56fe401f4a5b2ebe67b98bac99e98d0951e..3cb7d4ded16e2151797bf698a26f9d25b0a07c25 100644
+index 269e422ea2860979bf08c9a280d17b165f456e93..da66a86620a7f53f12693d2fc040446e036a8c37 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1136,6 +1136,7 @@ public class ServerPlayer extends Player {
+@@ -1141,6 +1141,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();

patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3cb7d4ded16e2151797bf698a26f9d25b0a07c25..03abb8ce73a7f1b640a30e4dd56ae990df7b0c3c 100644
+index da66a86620a7f53f12693d2fc040446e036a8c37..02d20650dd74b93efb47f07fea7265e1ae32c726 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1299,7 +1299,7 @@ public class ServerPlayer extends Player {
+@@ -1304,7 +1304,7 @@ public class ServerPlayer extends Player {
                              return entitymonster.isPreventingPlayerRest((Player) this);
                          });
  

patches/server/0193-Configurable-broadcast-settings.patch

@@ -17,10 +17,10 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fedd506fe05b259c64dba4ce5ffab06cd2e717a8..d2ea0e94785b6e1b37c50e4892a599a4f66a7ef8 100644
+index 02d20650dd74b93efb47f07fea7265e1ae32c726..4241087ad7b0d9f1f6705d88c9484fdd9bc80669 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -874,6 +874,7 @@ public class ServerPlayer extends Player {
+@@ -879,6 +879,7 @@ public class ServerPlayer extends Player {
              });
              Team scoreboardteambase = this.getTeam();
  
@@ -29,7 +29,7 @@ index fedd506fe05b259c64dba4ce5ffab06cd2e717a8..d2ea0e94785b6e1b37c50e4892a599a4
                  if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                      this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bc46e80e8dbe82d495d73a1b32bba763c0ca9715..246246836aa03801fe23495edb720d03562e26f0 100644
+index 98a05bf2a69278030f6643f82b601b363948a404..bc1535bf55852c89c2abf446b125b8bcc83f9279 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -174,6 +174,18 @@ public class PurpurConfig {

patches/server/0214-Make-lightning-rod-range-configurable.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f94c1b943488806d1336bd28ac9e8efd9e1fedbd..84febe41f4b1bb8a7117ed4212b10388e4eff9fe 100644
+index 9f37cc84cbbefd96dd64ae4c811d0257829de649..dbf9d73027320efeed5fda3a610281fd737540df 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1044,7 +1044,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1046,7 +1046,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              return villageplacetype == PoiType.LIGHTNING_ROD;
          }, (blockposition1) -> {
              return blockposition1.getY() == this.getLevel().getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;
@@ -18,7 +18,7 @@ index f94c1b943488806d1336bd28ac9e8efd9e1fedbd..84febe41f4b1bb8a7117ed4212b10388
          return optional.map((blockposition1) -> {
              return blockposition1.above(1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b42f87fad204dd21ba843b78c1f6710e95452a3a..505bcc6e2a3977af25c0f9de2b2477fa4657a6bd 100644
+index 06a560864e43e60ad13db17c4ffdc006381f5511..9b730c8e14d4ccbb46977bd2026c466a78008ec4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -349,6 +349,7 @@ public class PurpurConfig {

patches/server/0231-Customizable-sleeping-actionbar-messages.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1327e9f3c81f2cf05986cc66fea1f91515f6a457..38dd5b8d756069b8cf9b5cbd570a34435151dd2d 100644
+index dbf9d73027320efeed5fda3a610281fd737540df..42f6664ea6ddb3892b4549a78755efccd6f0f329 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -4,6 +4,7 @@ import com.google.common.annotations.VisibleForTesting;
@@ -34,7 +34,7 @@ index 1327e9f3c81f2cf05986cc66fea1f91515f6a457..38dd5b8d756069b8cf9b5cbd570a3443
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
-@@ -1087,11 +1092,29 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1089,11 +1094,29 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          if (this.canSleepThroughNights()) {
              if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
                  int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);