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

2024-01-19 12:30:04 +01:00
parent 864f4072c1
commit b5b92e90d8
38 changed files with 181 additions and 229 deletions
--- a/patches/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
     @Override
     public int getSpawnLimit(SpawnCategory spawnCategory) {
-         // Paper start
+         // Paper start - Add mobcaps commands
 +        Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
 +        Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory." + spawnCategory + " does not have a spawn limit.");
         return this.getSpawnLimitUnsafe(spawnCategory);