[ci skip] Add more identifying patch comments, merge related patches

patches/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch

@@ -9,9 +9,6 @@ previous getChunkAt method which had inlined logic for loaded
 chunks did get inlined, but the standard CPS.getChunkAt
 method was not inlined.
 
-Paper recently reverted this optimisation, so it's been reintroduced
-here.
-
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
@@ -20,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      @Override
      public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
-+        // Paper start - make sure loaded chunks get the inlined variant of this function
++        // Paper start - Perf: make sure loaded chunks get the inlined variant of this function
 +        net.minecraft.server.level.ServerChunkCache cps = ((ServerLevel)this).getChunkSource();
 +        if (cps.mainThread == Thread.currentThread()) {
 +            LevelChunk ifLoaded = cps.getChunkAtIfLoadedMainThread(chunkX, chunkZ);
@@ -28,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                return ifLoaded;
 +            }
 +        }
-+        // Paper end - make sure loaded chunks get the inlined variant of this function
++        // Paper end - Perf: make sure loaded chunks get the inlined variant of this function
          return (LevelChunk) this.getChunk(chunkX, chunkZ, ChunkStatus.FULL, true); // Paper - avoid a method jump
      }