fix decompile errors

patches/server/0005-Fix-decompile-errors.patch

@@ -0,0 +1,131 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Sun, 12 Jun 2022 06:20:21 -0500
+Subject: [PATCH] Fix decompile errors
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+index b6fc1b495e9173e625a7b2c856e79146734c4a9e..765dee56dd3a77e4bce137b84c4139202a5cef84 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
++++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+@@ -92,7 +92,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationL
+ 
+     @Override
+     public Brain<Allay> getBrain() {
+-        return super.getBrain();
++        return (Brain<Allay>) super.getBrain(); // Purpur - decompile error
+     }
+ 
+     public static AttributeSupplier.Builder createAttributes() {
+@@ -141,8 +141,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationL
+ 
+     @Override
+     public boolean hurt(DamageSource source, float amount) {
+-        Entity optional = source.getEntity();
+-        if (optional instanceof Player player) {
++        if (source.getEntity() instanceof Player player) { // Purpur - decompile error
+             Optional<UUID> optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER);
+             if (optional.isPresent() && player.getUUID().equals(optional.get())) {
+                 return false;
+diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..9e17e21a48892686e94a1c21b636695ab84eb7cd 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+@@ -105,7 +105,7 @@ public class Frog extends Animal {
+ 
+     @Override
+     public Brain<Frog> getBrain() {
+-        return super.getBrain();
++        return (Brain<Frog>) super.getBrain(); // Purpur - decompile error
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+index 45152840f10c2e0731ac653595dc0e81557227c4..7d093e4cc3357abd205302a98cc7b06cf55229bc 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+@@ -67,7 +67,7 @@ public class Tadpole extends AbstractFish {
+ 
+     @Override
+     public Brain<Tadpole> getBrain() {
+-        return super.getBrain();
++        return (Brain<Tadpole>) super.getBrain(); // Purpur - decompile error
+     }
+ 
+     @Override
+@@ -215,8 +215,7 @@ public class Tadpole extends AbstractFish {
+     }
+ 
+     private void ageUp() {
+-        Level frog = this.level;
+-        if (frog instanceof ServerLevel serverLevel) {
++        if (this.level instanceof ServerLevel serverLevel) { // Purpur - decompile error
+             Frog frog = EntityType.FROG.create(this.level);
+             frog.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
+             frog.finalizeSpawn(serverLevel, this.level.getCurrentDifficultyAt(frog.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData)null, (CompoundTag)null);
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+@@ -90,11 +90,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+     }
+ 
+     private static void initIdleActivity(Brain<Zoglin> brain) {
+-        brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1)))));
++        brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes<>(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne<>(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); // Purpur - decompile error
+     }
+ 
+     private static void initFightActivity(Brain<Zoglin> brain) {
+-        brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid()), MemoryModuleType.ATTACK_TARGET);
++        brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid<>()), MemoryModuleType.ATTACK_TARGET); // Purpur - decompile error
+     }
+ 
+     private Optional<? extends LivingEntity> findNearestValidAttackTarget() {
+@@ -183,7 +183,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+ 
+     @Override
+     public Brain<Zoglin> getBrain() {
+-        return super.getBrain();
++        return (Brain<Zoglin>) super.getBrain(); // Purpur - decompile error
+     }
+ 
+     protected void updateActivity() {
+diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+index ac75c54e897565e340b66823caeed92ba1d1641a..769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
++++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+@@ -70,7 +70,7 @@ public class PiglinBrute extends AbstractPiglin {
+ 
+     @Override
+     public Brain<PiglinBrute> getBrain() {
+-        return super.getBrain();
++        return (Brain<PiglinBrute>) super.getBrain(); // Purpur - decompile error
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..4366f7ff095c79a1f4444a27198f2613eb01fdc2 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
++++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+@@ -361,7 +361,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
+ 
+     @Override
+     public Brain<Warden> getBrain() {
+-        return super.getBrain();
++        return (Brain<Warden>) super.getBrain(); // Purpur - decompile error
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
+index 5dc3605fed7fb2ff8cc6c965d1bf99c462e0b14a..bcc1ce196c1dbf60cf6ae73d95766dc41ed22012 100644
+--- a/src/main/java/net/minecraft/world/level/block/Blocks.java
++++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
+@@ -1091,7 +1091,7 @@ public class Blocks {
+     }
+ 
+     private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType<?> type) {
+-        return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT;
++        return type == EntityType.OCELOT || type == EntityType.PARROT; // Purpur - decompile error
+     }
+ 
+     private static BedBlock bed(DyeColor color) {

patches/server/0006-Component-related-conveniences.patch

@@ -81,7 +81,7 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fa3263bffcfe042c2f210f85c6868fff08132a7c..2ec7eed33a322254ea9382554e0b7bfc558e0960 100644
+index 4d57f2b8d08a83e404f0b81321b18c83a47ddb4e..cba8aec79f7f1664a1410646c733f57f3c39ca5e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3765,6 +3765,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0007-Ridables.patch

@@ -4493,7 +4493,7 @@ index 6449213d717271bcc516e393a78dfe1e5c762d68..3b272b5653c6e7672f16eb35314c6899
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 056e4c2f7f632dadc0015710c032a0b718d46ff9..a6aaffc41a39be4ae1da44d54a27d324927e47d0 100644
+index 1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b..9970c2c09b294e601b7cda4f1e8cbf2aed13b0dc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 @@ -68,6 +68,23 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -4520,29 +4520,6 @@ index 056e4c2f7f632dadc0015710c032a0b718d46ff9..a6aaffc41a39be4ae1da44d54a27d324
      @Override
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-@@ -90,11 +107,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
-     }
- 
-     private static void initIdleActivity(Brain<Zoglin> brain) {
--        brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1)))));
-+        brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes<>(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne<>(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); // Purpur - decompile fix
-     }
- 
-     private static void initFightActivity(Brain<Zoglin> brain) {
--        brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid()), MemoryModuleType.ATTACK_TARGET);
-+        brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid<>()), MemoryModuleType.ATTACK_TARGET); // Purpur - decompile fix
-     }
- 
-     private Optional<? extends LivingEntity> findNearestValidAttackTarget() {
-@@ -183,7 +200,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
- 
-     @Override
-     public Brain<Zoglin> getBrain() {
--        return super.getBrain();
-+        return (Brain<Zoglin>) super.getBrain(); // Purpur - decompile error
-     }
- 
-     protected void updateActivity() {
 @@ -200,6 +217,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
      @Override
      protected void customServerAiStep() {
@@ -4717,7 +4694,7 @@ index 9bde52b723237b1f0f945bc564009e3507993508..b5b2d1f8ab8dedfa38e0ed4c99a0e008
          this.level.getProfiler().pop();
          PiglinAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index ac75c54e897565e340b66823caeed92ba1d1641a..ff149234a8f3e1c94961e41d5bc8117460b301d9 100644
+index 769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53..ff149234a8f3e1c94961e41d5bc8117460b301d9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -41,6 +41,23 @@ public class PiglinBrute extends AbstractPiglin {
@@ -4744,15 +4721,6 @@ index ac75c54e897565e340b66823caeed92ba1d1641a..ff149234a8f3e1c94961e41d5bc81174
      public static AttributeSupplier.Builder createAttributes() {
          return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D);
      }
-@@ -70,7 +87,7 @@ public class PiglinBrute extends AbstractPiglin {
- 
-     @Override
-     public Brain<PiglinBrute> getBrain() {
--        return super.getBrain();
-+        return (Brain<PiglinBrute>) super.getBrain(); // Purpur - decompile error
-     }
- 
-     @Override
 @@ -86,6 +103,7 @@ public class PiglinBrute extends AbstractPiglin {
      @Override
      protected void customServerAiStep() {

patches/server/0008-Configurable-entity-base-attributes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dd4f434d26814f46285f2bd23f8a4b53c89872d7..aea8814bf1ed44075c54b18fcdc8676579f07a6e 100644
+index e2b2be41e9981196650096dd9d468618a96cb28e..5fa0b40eaa545d1047591f7166bb43e1872ffe34 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
@@ -1297,7 +1297,7 @@ index 3b272b5653c6e7672f16eb35314c689910c14250..b374069a1e88db67a56d6d5f9e05318c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index a6aaffc41a39be4ae1da44d54a27d324927e47d0..a91ec2e385940b12bc41d9c09819c9081edc5c44 100644
+index 9970c2c09b294e601b7cda4f1e8cbf2aed13b0dc..6236a557d2a73dff70141140f79faf851a2062f0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 @@ -83,6 +83,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {

patches/server/0012-AFK-API.patch

@@ -68,7 +68,7 @@ index f4b33e5788665eefef35e701ed99d58d0ea1b3c2..e40e8e837273c243f5ccc192514d5404
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b7427d6d59006c84fbd8d16d4446e7670761e66..df5cbfda7b3eae38583d01ea96874bdb7f5b3b65 100644
+index 22fad6467c6b9202e8cbf3e77e90c50f73f1f640..c48b44129881d864cca6254b222d0ecbb7d78bcf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -313,6 +313,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0014-Configurable-server-mod-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bee6004f68f344b2979f9262d99d5d08802751ab..b844bffb6363efcb4d8a6fc8489542d7bcfa35d0 100644
+index d4b05231b6b631f382d7e5fe6c42eba3e1581fad..400a9580db10aa647eb6c0a68d521b4bd998ba4b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1657,7 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0016-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b844bffb6363efcb4d8a6fc8489542d7bcfa35d0..cd583a9f0382ba7d58342df8a30ad7399f193db5 100644
+index 400a9580db10aa647eb6c0a68d521b4bd998ba4b..55ba57bef13dfd22ceecc660391423767f2826d5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -291,6 +291,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0019-Player-invulnerabilities.patch

@@ -82,7 +82,7 @@ index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc726
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index df5cbfda7b3eae38583d01ea96874bdb7f5b3b65..487ce0230306fbfc78bc604e0a6ce202df628382 100644
+index c48b44129881d864cca6254b222d0ecbb7d78bcf..474944b20fb81e9e4ed42ec2895673c98bc36420 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2003,12 +2003,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0029-Zombie-horse-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d8c014f2bccd7a47c064d802fcc0acb787c18eda..16c6eedc545a34b92bccf448011b40f0916bbdb0 100644
+index cabd856dc050359bbeb1e138535e44bf2a294d5c..5f07e8669336d4ce27aa5f7837faf83682a9dff3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -792,9 +792,15 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0050-Fix-the-dead-lagging-the-server.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aea8814bf1ed44075c54b18fcdc8676579f07a6e..24728fbacddf7cb6e5b6f3956cd950ab83867dc4 100644
+index 5fa0b40eaa545d1047591f7166bb43e1872ffe34..f04412aa992986bd8a1e76f581e48f0bddc2ab17 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1865,6 +1865,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0053-Configurable-TPS-Catchup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cd583a9f0382ba7d58342df8a30ad7399f193db5..832f6c7d38975426725f999659765ba49cfd7ccf 100644
+index 55ba57bef13dfd22ceecc660391423767f2826d5..316fbcc26137ad6ef03eb9a535cff93eb2faa551 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1191,7 +1191,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0061-Configurable-void-damage-height-and-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 24728fbacddf7cb6e5b6f3956cd950ab83867dc4..2619685affa6a3fa8fee4fdc3047e44ab7e7042e 100644
+index f04412aa992986bd8a1e76f581e48f0bddc2ab17..d032cd8054bcba9fd29ea62b234e6453e0a44adf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -884,7 +884,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0066-Add-5-second-tps-average-in-tps.patch

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 832f6c7d38975426725f999659765ba49cfd7ccf..76bc94d5263f0ad354a385eb5b5270cda21c727b 100644
+index 316fbcc26137ad6ef03eb9a535cff93eb2faa551..11d5b4d1e0400e9e2baacbf9690ce1ababe85139 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -287,7 +287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0068-Item-entity-immunities.patch

@@ -18,7 +18,7 @@ index e134963fa97ea886c7cf4af8ab0ba53b6010fe41..9366df32861a471afa31382fe468c249
          private final int range;
          SectionPos lastSectionPos;
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 9539470e037ec6461413455ded1dd69074051ba2..fbb6744ca919469d8769570bd1c4d1764f6754a5 100644
+index 1eb912ad97f9663bf6bd336ad739f2552b0a5c9b..3441339e1ba5efb0e25c16fa13cb65d2fbdafc42 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -65,7 +65,7 @@ public class ServerEntity {

patches/server/0078-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1f7dbc3c773179a21f8b11c455ef9f4fa1971048..f4046f090ba589529b13671b790a3c3596af1247 100644
+index e2f57af54380c7afa5c6ac00c8aba74e838465c4..c84cb931a78390fd485b95e8c9b9904de920f254 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1273,13 +1273,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0092-Stop-squids-floating-on-top-of-water.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6b92be36b86ecc5a82b4ca70ba187c53ec102adc..d152c3192108cdd16507e75649516a33916314a9 100644
+index c5898834338046237d2690fd82443ac6844055a2..d0e0811601684199206f4c6e23e077a2c987e86b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4034,6 +4034,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0094-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d152c3192108cdd16507e75649516a33916314a9..3a6e7e7a71f5fe796e668a24c790abef8b524c6c 100644
+index d0e0811601684199206f4c6e23e077a2c987e86b..8873e947665a877255d92548f7e894f6d8b708f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2868,7 +2868,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 16c6eedc545a34b92bccf448011b40f0916bbdb0..a179cc4b66b830ee2b7764fe54f4e861666afd5e 100644
+index 5f07e8669336d4ce27aa5f7837faf83682a9dff3..476047528dc9dbb7983f47e960f4d3e2fa1044ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -505,7 +505,24 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0104-Configurable-daylight-cycle.patch

@@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time % 192000; // Paper - fix guardian beam
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 76bc94d5263f0ad354a385eb5b5270cda21c727b..0705540e8131d4c4bcc28fbf403b342323b11e5a 100644
+index 11d5b4d1e0400e9e2baacbf9690ce1ababe85139..ce90ecb258c954146fbe7a9f393cbe29061d0e9a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1528,7 +1528,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -31,7 +31,7 @@ index 76bc94d5263f0ad354a385eb5b5270cda21c727b..0705540e8131d4c4bcc28fbf403b3423
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a179cc4b66b830ee2b7764fe54f4e861666afd5e..fd1129945d777746c4579e72f993859c9935a694 100644
+index 476047528dc9dbb7983f47e960f4d3e2fa1044ee..ce01371b78b995c46d4143c2d177b448720760af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -210,6 +210,8 @@ public class ServerLevel extends Level implements WorldGenLevel {