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

patches/server/add-per-world-spawn-limits.patch

@@ -3,7 +3,6 @@ From: chase <chasewhip20@gmail.com>
 Date: Wed, 2 Dec 2020 22:43:39 -0800
 Subject: [PATCH] add per world spawn limits
 
-Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -19,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                setSpawnLimit(spawnCategory, this.world.paperConfig().entities.spawning.spawnLimits.getInt(CraftSpawnCategory.toNMS(spawnCategory)));
 +            }
 +        }
-+        // Paper end
++        // Paper end - per world spawn limits
      }
  
      @Override