Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@acc6d01 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9861)
PaperMC/Paper@b974a6b Update paperweight to 1.5.9 (#9872)

patches/server/0267-Remove-Mojang-Profiler.patch

@@ -39,7 +39,7 @@ index af712f089e7919fa0bd3946866fd3486fab19f76..9caab6541a224dc8f729a7d720eccda7
  
          return b0;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651fd60e483 100644
+index bf5cc18304f464aec59f3982311a0a99d9a9706b..926ba816e7bccec0d1b34c2f8fc3300be84df4c2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -338,13 +338,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -398,7 +398,7 @@ index a6a1b57b4327f5710e9ec5ebca35a47c11751d11..097ac55028d66ef9ab430ff5dd103db6
  
                  ++j;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 75461a983b24e399fc695322f4e396250b991c9e..3f4df62773dfe1045914325ce5bc13162192679c 100644
+index ec3df1e04febcc9b2f3e47ff38f642d131f6a313..8f8f6b409ad28f0fe577f274abbd9e99112bdec4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -466,20 +466,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -427,7 +427,7 @@ index 75461a983b24e399fc695322f4e396250b991c9e..3f4df62773dfe1045914325ce5bc1316
  
      public boolean hasWork() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac352c9a35ba 100644
+index 03bde9d1c765700c872cc592fe414eb815956e47..43a46feb5fb4bf23d71bc4f6c08caa93b1959ffc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -279,16 +279,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -504,7 +504,7 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
 +            //gameprofilerfiller.push("pollingChunks"); // Purpur
              this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random
              int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
-             boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
+             boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
  
 -            gameprofilerfiller.push("naturalSpawnCount");
 +            //gameprofilerfiller.push("naturalSpawnCount"); // Purpur
@@ -566,7 +566,7 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac7cd64925 100644
+index d5837c675e033c7277656e026cb98d55b6668038..c3239a2823d152b8de1f760216323936c8b3a1ff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -823,12 +823,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -591,7 +591,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
          this.tickTime();
 -        gameprofilerfiller.popPush("tickPending");
 +        //gameprofilerfiller.popPush("tickPending"); // Purpur
-         //timings.scheduledBlocks.startTiming(); // Paper // Purpur
+         //this.timings.scheduledBlocks.startTiming(); // Paper // Purpur
          if (!this.isDebug()) {
              j = this.getGameTime();
 -            gameprofilerfiller.push("blockTicks");
@@ -603,7 +603,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
 -            gameprofilerfiller.pop();
 +            //gameprofilerfiller.pop(); // Purpur
          }
-         //timings.scheduledBlocks.stopTiming(); // Paper // Purpur
+         //this.timings.scheduledBlocks.stopTiming(); // Paper // Purpur
  
 -        gameprofilerfiller.popPush("raid");
 +        //gameprofilerfiller.popPush("raid"); // Purpur
@@ -617,9 +617,9 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
          //this.timings.chunkProviderTick.stopTiming(); // Paper - timings // Purpur
 -        gameprofilerfiller.popPush("blockEvents");
 +        //gameprofilerfiller.popPush("blockEvents"); // Purpur
-         //timings.doSounds.startTiming(); // Spigot // Purpur
+         //this.timings.doSounds.startTiming(); // Spigot // Purpur
          this.runBlockEvents();
-         //timings.doSounds.stopTiming(); // Spigot // Purpur
+         //this.timings.doSounds.stopTiming(); // Spigot // Purpur
          this.handlingTick = false;
 -        gameprofilerfiller.pop();
 +        //gameprofilerfiller.pop(); // Purpur
@@ -632,7 +632,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
          if (flag || this.emptyTime++ < 300) {
 -            gameprofilerfiller.push("entities");
 +            //gameprofilerfiller.push("entities"); // Purpur
-             //timings.tickEntities.startTiming(); // Spigot // Purpur
+             //this.timings.tickEntities.startTiming(); // Spigot // Purpur
              if (this.dragonFight != null) {
 -                gameprofilerfiller.push("dragonFight");
 +                //gameprofilerfiller.push("dragonFight"); // Purpur
@@ -673,8 +673,8 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
                      }
                  }
              });
-             //timings.entityTick.stopTiming(); // Spigot // Purpur
-             //timings.tickEntities.stopTiming(); // Spigot // Purpur
+             //this.timings.entityTick.stopTiming(); // Spigot // Purpur
+             //this.timings.tickEntities.stopTiming(); // Spigot // Purpur
 -            gameprofilerfiller.pop();
 +            //gameprofilerfiller.pop(); // Purpur
              this.tickBlockEntities();
@@ -778,7 +778,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c75e5a9078 100644
+index 9e561a8e59666f10468ab8fd5a533f63bdc6cf2a..47527f6145a71d56c428b012033bb8b6b086054f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1237,7 +1237,7 @@ public class ServerPlayer extends Player {
@@ -811,7 +811,7 @@ index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c7
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 0166107f8b48393a93ac046e6af70f0ff24fbb85..fa7f85303f9fe80a2e51740c376d9daedfaa60b4 100644
+index 61e794f63c6ec9b19ff0e75924470ea9a1db442e..b19c59a87d4136da583a0b687f6b27fef3456f09 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -209,7 +209,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -1037,7 +1037,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad4fde00d4 100644
+index 30365690fb8b0170636e712ccecb267e3ae53e0a..380f93a750c30c1ce0d0050c35eea19e98f3a8b9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -809,7 +809,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1163,7 +1163,7 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              }
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e07fa7386 100644
+index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd13ec68a7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -410,7 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1488,7 +1488,7 @@ index 09f796ec491f21520e1fcc454249e4696dad3b1b..9bf06cf7b3706f8883e1a0ceac8b1aeb
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 7223528b4fb2885e0f6c0df2238cada16dbed35e..61cd0e050a2784f1d59ed3c9493e2386ef5fc3bb 100644
+index 89e473aadb1ab0bd802e7f74a77cce09578320d7..7369290820f726c28c87bc63dba2a74f415bb126 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -320,12 +320,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -1745,7 +1745,7 @@ index 45243249a561440512ef2a620c60b02e159c80e2..b26cea981a876fd42c9ab91923d507b3
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fc27f690d302559dd534e9f4ede7a7bd6422837a..a90288a86b022b4f9682befcb1478671e861ca41 100644
+index 8b537022638648c11396c0ee638750c712a6230b..25540a7f5631acd856726cdb44bace9be7dab401 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1301,9 +1301,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1757,16 +1757,16 @@ index fc27f690d302559dd534e9f4ede7a7bd6422837a..a90288a86b022b4f9682befcb1478671
  
 -        gameprofilerfiller.push("blockEntities");
 +        //gameprofilerfiller.push("blockEntities"); // Purpur
-         //timings.tileEntityPending.startTiming(); // Spigot // Purpur
+         //this.timings.tileEntityPending.startTiming(); // Spigot // Purpur
          this.tickingBlockEntities = true;
          if (!this.pendingBlockEntityTickers.isEmpty()) {
 @@ -1348,7 +1348,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         //timings.tileEntityTick.stopTiming(); // Spigot // Purpur
+         //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur
          this.tickingBlockEntities = false;
          co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
 -        gameprofilerfiller.pop();
 +        //gameprofilerfiller.pop(); // Purpur
-         spigotConfig.currentPrimedTnt = 0; // Spigot
+         this.spigotConfig.currentPrimedTnt = 0; // Spigot
      }
  
 @@ -1551,7 +1551,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1819,7 +1819,7 @@ index 1e3349690d00c7889a381f7c65a3b5bf3de2ac5b..524301e2438ee2938b59eb2b2e9fc4e0
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32..220e1dbf70e7d51ea69d964eb7e84f55aa5a32d7 100644
+index 88b7f814a1454841b1f1b27e9c7d66d64717a422..66656c4cf157228c9f52b33b358713ef0172f9ff 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -457,11 +457,11 @@ public class LevelChunk extends ChunkAccess {