<3 jmp

patches/server/Add-tick-times-API-and-mspt-command.patch

@@ -151,9 +151,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             };
+     public static record ServerResourcePackInfo(String url, String hash, boolean isRequired, @Nullable Component prompt) {
-         }
+ 
      }
++
 +    // Paper start
 +    public static class TickTimes {
 +        private final long[] times;

patches/server/Configurable-chance-of-villager-zombie-infection.patch

@@ -28,17 +28,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -0,0 +0,0 @@ public class Zombie extends Monster {
-     @Override
+     public boolean wasKilled(ServerLevel world, LivingEntity other) {
-     public void killed(ServerLevel world, LivingEntity other) {
+         boolean flag = super.wasKilled(world, other);
-         super.killed(world, other);
+ 
 -        if ((world.getDifficulty() == Difficulty.NORMAL || world.getDifficulty() == Difficulty.HARD) && other instanceof Villager) {
 -            if (world.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
++        // Paper start
 +        if (level.paperConfig.zombieVillagerInfectionChance != 0.0 && (level.paperConfig.zombieVillagerInfectionChance != -1.0 || world.getDifficulty() == Difficulty.NORMAL || world.getDifficulty() == Difficulty.HARD) && other instanceof Villager) {
 +            if (level.paperConfig.zombieVillagerInfectionChance == -1.0 && world.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
-                 return;
+                 return flag;
              }
 +            if (level.paperConfig.zombieVillagerInfectionChance != -1.0 && (this.random.nextDouble() * 100.0) > level.paperConfig.zombieVillagerInfectionChance) {
-+                return;
++                return flag;
 +            } // Paper end
  
              Villager entityvillager = (Villager) other;

patches/server/Validate-tripwire-hook-placement-before-update.patch

@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -0,0 +0,0 @@ public class TripWireHookBlock extends Block {
  
-         this.playSound(world, pos, flag4, flag5, flag2, flag3);
+         this.emitState(world, pos, flag4, flag5, flag2, flag3);
          if (!beingRemoved) {
 +            if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate
              world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3);

patches/server/implement-optional-per-player-mob-spawns.patch

@@ -422,11 +422,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -0,0 +0,0 @@ public final class NaturalSpawner {
- 
      private NaturalSpawner() {}
  
-+    // Paper start - add countMobs parameter
      public static NaturalSpawner.SpawnState createState(int spawningChunkCount, Iterable<Entity> entities, NaturalSpawner.ChunkGetter chunkSource, LocalMobCapCalculator localmobcapcalculator) {
++        // Paper start - add countMobs parameter
 +        return createState(spawningChunkCount, entities, chunkSource, localmobcapcalculator, false);
 +    }
 +
@@ -494,11 +493,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
 @@ -0,0 +0,0 @@ public final class NaturalSpawner {
-         world.getProfiler().pop();
      }
  
-+    // Paper start - add parameters and int ret type
      public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
++        // Paper start - add parameters and int ret type
 +        spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 +    }
 +    public static int spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner, int maxSpawns, Consumer<Entity> trackEntity) {
@@ -523,7 +521,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    public static int spawnCategoryForPosition(MobCategory group, ServerLevel world, ChunkAccess chunk, BlockPos pos, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner, int maxSpawns, Consumer<Entity> trackEntity) {
 +    // Paper end - add maxSpawns parameter and return spawned mobs
-         StructureFeatureManager structuremanager = world.structureFeatureManager();
+         StructureManager structuremanager = world.structureManager();
          ChunkGenerator chunkgenerator = world.getChunkSource().getGenerator();
          int i = pos.getY();
          BlockState iblockdata = world.getBlockStateIfLoadedAndInBounds(pos); // Paper - don't load chunks for mob spawn