--- a/net/minecraft/world/entity/monster/Strider.java
+++ b/net/minecraft/world/entity/monster/Strider.java
@@ -1,6 +1,8 @@
 package net.minecraft.world.entity.monster;
 
 import com.google.common.collect.Sets;
+import com.google.common.collect.UnmodifiableIterator;
+import java.util.Iterator;
 import java.util.Set;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
@@ -55,6 +57,7 @@
 import net.minecraft.world.entity.vehicle.DismountHelper;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
@@ -72,21 +75,21 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 
 public class Strider extends Animal implements ItemSteerable, Saddleable {
+
     private static final ResourceLocation SUFFOCATING_MODIFIER_ID = ResourceLocation.withDefaultNamespace("suffocating");
-    private static final AttributeModifier SUFFOCATING_MODIFIER = new AttributeModifier(
-        SUFFOCATING_MODIFIER_ID, -0.34F, AttributeModifier.Operation.ADD_MULTIPLIED_BASE
-    );
+    private static final AttributeModifier SUFFOCATING_MODIFIER = new AttributeModifier(Strider.SUFFOCATING_MODIFIER_ID, -0.3400000035762787D, AttributeModifier.Operation.ADD_MULTIPLIED_BASE);
     private static final float SUFFOCATE_STEERING_MODIFIER = 0.35F;
     private static final float STEERING_MODIFIER = 0.55F;
     private static final EntityDataAccessor<Integer> DATA_BOOST_TIME = SynchedEntityData.defineId(Strider.class, EntityDataSerializers.INT);
     private static final EntityDataAccessor<Boolean> DATA_SUFFOCATING = SynchedEntityData.defineId(Strider.class, EntityDataSerializers.BOOLEAN);
     private static final EntityDataAccessor<Boolean> DATA_SADDLE_ID = SynchedEntityData.defineId(Strider.class, EntityDataSerializers.BOOLEAN);
-    public final ItemBasedSteering steering = new ItemBasedSteering(this.entityData, DATA_BOOST_TIME, DATA_SADDLE_ID);
+    public final ItemBasedSteering steering;
     @Nullable
     private TemptGoal temptGoal;
 
     public Strider(EntityType<? extends Strider> type, Level world) {
         super(type, world);
+        this.steering = new ItemBasedSteering(this.entityData, Strider.DATA_BOOST_TIME, Strider.DATA_SADDLE_ID);
         this.blocksBuilding = true;
         this.setPathfindingMalus(PathType.WATER, -1.0F);
         this.setPathfindingMalus(PathType.LAVA, 0.0F);
@@ -95,18 +98,18 @@
     }
 
     public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-        BlockPos.MutableBlockPos mutableBlockPos = pos.mutable();
+        BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
 
         do {
-            mutableBlockPos.move(Direction.UP);
-        } while (world.getFluidState(mutableBlockPos).is(FluidTags.LAVA));
+            blockposition_mutableblockposition.move(Direction.UP);
+        } while (world.getFluidState(blockposition_mutableblockposition).is(FluidTags.LAVA));
 
-        return world.getBlockState(mutableBlockPos).isAir();
+        return world.getBlockState(blockposition_mutableblockposition).isAir();
     }
 
     @Override
     public void onSyncedDataUpdated(EntityDataAccessor<?> data) {
-        if (DATA_BOOST_TIME.equals(data) && this.level().isClientSide) {
+        if (Strider.DATA_BOOST_TIME.equals(data) && this.level().isClientSide) {
             this.steering.onSynced();
         }
 
@@ -116,9 +119,9 @@
     @Override
     protected void defineSynchedData(SynchedEntityData.Builder builder) {
         super.defineSynchedData(builder);
-        builder.define(DATA_BOOST_TIME, 0);
-        builder.define(DATA_SUFFOCATING, false);
-        builder.define(DATA_SADDLE_ID, false);
+        builder.define(Strider.DATA_BOOST_TIME, 0);
+        builder.define(Strider.DATA_SUFFOCATING, false);
+        builder.define(Strider.DATA_SADDLE_ID, false);
     }
 
     @Override
@@ -147,38 +150,43 @@
     public void equipSaddle(ItemStack stack, @Nullable SoundSource soundCategory) {
         this.steering.setSaddle(true);
         if (soundCategory != null) {
-            this.level().playSound(null, this, SoundEvents.STRIDER_SADDLE, soundCategory, 0.5F, 1.0F);
+            this.level().playSound((Player) null, (Entity) this, SoundEvents.STRIDER_SADDLE, soundCategory, 0.5F, 1.0F);
         }
+
     }
 
     @Override
     protected void registerGoals() {
-        this.goalSelector.addGoal(1, new PanicGoal(this, 1.65));
-        this.goalSelector.addGoal(2, new BreedGoal(this, 1.0));
-        this.temptGoal = new TemptGoal(this, 1.4, stack -> stack.is(ItemTags.STRIDER_TEMPT_ITEMS), false);
+        this.goalSelector.addGoal(1, new PanicGoal(this, 1.65D));
+        this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
+        this.temptGoal = new TemptGoal(this, 1.4D, (itemstack) -> {
+            return itemstack.is(ItemTags.STRIDER_TEMPT_ITEMS);
+        }, false);
         this.goalSelector.addGoal(3, this.temptGoal);
-        this.goalSelector.addGoal(4, new Strider.StriderGoToLavaGoal(this, 1.0));
-        this.goalSelector.addGoal(5, new FollowParentGoal(this, 1.0));
-        this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0, 60));
+        this.goalSelector.addGoal(4, new Strider.StriderGoToLavaGoal(this, 1.0D));
+        this.goalSelector.addGoal(5, new FollowParentGoal(this, 1.0D));
+        this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0D, 60));
         this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 8.0F));
         this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
         this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Strider.class, 8.0F));
     }
 
     public void setSuffocating(boolean cold) {
-        this.entityData.set(DATA_SUFFOCATING, cold);
-        AttributeInstance attributeInstance = this.getAttribute(Attributes.MOVEMENT_SPEED);
-        if (attributeInstance != null) {
+        this.entityData.set(Strider.DATA_SUFFOCATING, cold);
+        AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
+
+        if (attributemodifiable != null) {
             if (cold) {
-                attributeInstance.addOrUpdateTransientModifier(SUFFOCATING_MODIFIER);
+                attributemodifiable.addOrUpdateTransientModifier(Strider.SUFFOCATING_MODIFIER);
             } else {
-                attributeInstance.removeModifier(SUFFOCATING_MODIFIER_ID);
+                attributemodifiable.removeModifier(Strider.SUFFOCATING_MODIFIER_ID);
             }
         }
+
     }
 
     public boolean isSuffocating() {
-        return this.entityData.get(DATA_SUFFOCATING);
+        return (Boolean) this.entityData.get(Strider.DATA_SUFFOCATING);
     }
 
     @Override
@@ -188,10 +196,11 @@
 
     @Override
     protected Vec3 getPassengerAttachmentPoint(Entity passenger, EntityDimensions dimensions, float scaleFactor) {
-        float f = Math.min(0.25F, this.walkAnimation.speed());
-        float g = this.walkAnimation.position();
-        float h = 0.12F * Mth.cos(g * 1.5F) * 2.0F * f;
-        return super.getPassengerAttachmentPoint(passenger, dimensions, scaleFactor).add(0.0, (double)(h * scaleFactor), 0.0);
+        float f1 = Math.min(0.25F, this.walkAnimation.speed());
+        float f2 = this.walkAnimation.position();
+        float f3 = 0.12F * Mth.cos(f2 * 1.5F) * 2.0F * f1;
+
+        return super.getPassengerAttachmentPoint(passenger, dimensions, scaleFactor).add(0.0D, (double) (f3 * scaleFactor), 0.0D);
     }
 
     @Override
@@ -202,45 +211,61 @@
     @Nullable
     @Override
     public LivingEntity getControllingPassenger() {
-        return (LivingEntity)(this.isSaddled() && this.getFirstPassenger() instanceof Player player && player.isHolding(Items.WARPED_FUNGUS_ON_A_STICK)
-            ? player
-            : super.getControllingPassenger());
+        if (this.isSaddled()) {
+            Entity entity = this.getFirstPassenger();
+
+            if (entity instanceof Player) {
+                Player entityhuman = (Player) entity;
+
+                if (entityhuman.isHolding(Items.WARPED_FUNGUS_ON_A_STICK)) {
+                    return entityhuman;
+                }
+            }
+        }
+
+        return super.getControllingPassenger();
     }
 
     @Override
     public Vec3 getDismountLocationForPassenger(LivingEntity passenger) {
-        Vec3[] vec3s = new Vec3[]{
-            getCollisionHorizontalEscapeVector((double)this.getBbWidth(), (double)passenger.getBbWidth(), passenger.getYRot()),
-            getCollisionHorizontalEscapeVector((double)this.getBbWidth(), (double)passenger.getBbWidth(), passenger.getYRot() - 22.5F),
-            getCollisionHorizontalEscapeVector((double)this.getBbWidth(), (double)passenger.getBbWidth(), passenger.getYRot() + 22.5F),
-            getCollisionHorizontalEscapeVector((double)this.getBbWidth(), (double)passenger.getBbWidth(), passenger.getYRot() - 45.0F),
-            getCollisionHorizontalEscapeVector((double)this.getBbWidth(), (double)passenger.getBbWidth(), passenger.getYRot() + 45.0F)
-        };
+        Vec3[] avec3d = new Vec3[]{getCollisionHorizontalEscapeVector((double) this.getBbWidth(), (double) passenger.getBbWidth(), passenger.getYRot()), getCollisionHorizontalEscapeVector((double) this.getBbWidth(), (double) passenger.getBbWidth(), passenger.getYRot() - 22.5F), getCollisionHorizontalEscapeVector((double) this.getBbWidth(), (double) passenger.getBbWidth(), passenger.getYRot() + 22.5F), getCollisionHorizontalEscapeVector((double) this.getBbWidth(), (double) passenger.getBbWidth(), passenger.getYRot() - 45.0F), getCollisionHorizontalEscapeVector((double) this.getBbWidth(), (double) passenger.getBbWidth(), passenger.getYRot() + 45.0F)};
         Set<BlockPos> set = Sets.newLinkedHashSet();
-        double d = this.getBoundingBox().maxY;
-        double e = this.getBoundingBox().minY - 0.5;
-        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+        double d0 = this.getBoundingBox().maxY;
+        double d1 = this.getBoundingBox().minY - 0.5D;
+        BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
+        Vec3[] avec3d1 = avec3d;
+        int i = avec3d.length;
 
-        for (Vec3 vec3 : vec3s) {
-            mutableBlockPos.set(this.getX() + vec3.x, d, this.getZ() + vec3.z);
+        for (int j = 0; j < i; ++j) {
+            Vec3 vec3d = avec3d1[j];
 
-            for (double f = d; f > e; f--) {
-                set.add(mutableBlockPos.immutable());
-                mutableBlockPos.move(Direction.DOWN);
+            blockposition_mutableblockposition.set(this.getX() + vec3d.x, d0, this.getZ() + vec3d.z);
+
+            for (double d2 = d0; d2 > d1; --d2) {
+                set.add(blockposition_mutableblockposition.immutable());
+                blockposition_mutableblockposition.move(Direction.DOWN);
             }
         }
 
-        for (BlockPos blockPos : set) {
-            if (!this.level().getFluidState(blockPos).is(FluidTags.LAVA)) {
-                double g = this.level().getBlockFloorHeight(blockPos);
-                if (DismountHelper.isBlockFloorValid(g)) {
-                    Vec3 vec32 = Vec3.upFromBottomCenterOf(blockPos, g);
+        Iterator iterator = set.iterator();
 
-                    for (Pose pose : passenger.getDismountPoses()) {
-                        AABB aABB = passenger.getLocalBoundsForPose(pose);
-                        if (DismountHelper.canDismountTo(this.level(), passenger, aABB.move(vec32))) {
-                            passenger.setPose(pose);
-                            return vec32;
+        while (iterator.hasNext()) {
+            BlockPos blockposition = (BlockPos) iterator.next();
+
+            if (!this.level().getFluidState(blockposition).is(FluidTags.LAVA)) {
+                double d3 = this.level().getBlockFloorHeight(blockposition);
+
+                if (DismountHelper.isBlockFloorValid(d3)) {
+                    Vec3 vec3d1 = Vec3.upFromBottomCenterOf(blockposition, d3);
+                    UnmodifiableIterator unmodifiableiterator = passenger.getDismountPoses().iterator();
+
+                    while (unmodifiableiterator.hasNext()) {
+                        Pose entitypose = (Pose) unmodifiableiterator.next();
+                        AABB axisalignedbb = passenger.getLocalBoundsForPose(entitypose);
+
+                        if (DismountHelper.canDismountTo(this.level(), passenger, axisalignedbb.move(vec3d1))) {
+                            passenger.setPose(entitypose);
+                            return vec3d1;
                         }
                     }
                 }
@@ -260,12 +285,12 @@
 
     @Override
     protected Vec3 getRiddenInput(Player controllingPlayer, Vec3 movementInput) {
-        return new Vec3(0.0, 0.0, 1.0);
+        return new Vec3(0.0D, 0.0D, 1.0D);
     }
 
     @Override
     protected float getRiddenSpeed(Player controllingPlayer) {
-        return (float)(this.getAttributeValue(Attributes.MOVEMENT_SPEED) * (double)(this.isSuffocating() ? 0.35F : 0.55F) * (double)this.steering.boostFactor());
+        return (float) (this.getAttributeValue(Attributes.MOVEMENT_SPEED) * (double) (this.isSuffocating() ? 0.35F : 0.55F) * (double) this.steering.boostFactor());
     }
 
     @Override
@@ -302,22 +327,38 @@
         }
 
         if (!this.isNoAi()) {
-            boolean bl;
-            boolean var10000;
-            label36: {
-                BlockState blockState = this.level().getBlockState(this.blockPosition());
-                BlockState blockState2 = this.getBlockStateOnLegacy();
-                bl = blockState.is(BlockTags.STRIDER_WARM_BLOCKS) || blockState2.is(BlockTags.STRIDER_WARM_BLOCKS) || this.getFluidHeight(FluidTags.LAVA) > 0.0;
-                if (this.getVehicle() instanceof Strider strider && strider.isSuffocating()) {
-                    var10000 = true;
-                    break label36;
+            boolean flag;
+            boolean flag1;
+            label36:
+            {
+                BlockState iblockdata = this.level().getBlockState(this.blockPosition());
+                BlockState iblockdata1 = this.getBlockStateOnLegacy();
+
+                flag = iblockdata.is(BlockTags.STRIDER_WARM_BLOCKS) || iblockdata1.is(BlockTags.STRIDER_WARM_BLOCKS) || this.getFluidHeight(FluidTags.LAVA) > 0.0D;
+                Entity entity = this.getVehicle();
+
+                if (entity instanceof Strider) {
+                    Strider entitystrider = (Strider) entity;
+
+                    if (entitystrider.isSuffocating()) {
+                        flag1 = true;
+                        break label36;
+                    }
                 }
 
-                var10000 = false;
+                flag1 = false;
             }
 
-            boolean bl2 = var10000;
-            this.setSuffocating(!bl || bl2);
+            boolean flag2 = flag1;
+
+            // CraftBukkit start
+            boolean suffocating = !flag || flag2;
+            if (suffocating ^ this.isSuffocating()) {
+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callStriderTemperatureChangeEvent(this, suffocating)) {
+                    this.setSuffocating(suffocating);
+                }
+            }
+            // CraftBukkit end
         }
 
         super.tick();
@@ -336,18 +377,19 @@
 
     private void floatStrider() {
         if (this.isInLava()) {
-            CollisionContext collisionContext = CollisionContext.of(this);
-            if (collisionContext.isAbove(LiquidBlock.STABLE_SHAPE, this.blockPosition(), true)
-                && !this.level().getFluidState(this.blockPosition().above()).is(FluidTags.LAVA)) {
+            CollisionContext voxelshapecollision = CollisionContext.of(this);
+
+            if (voxelshapecollision.isAbove(LiquidBlock.STABLE_SHAPE, this.blockPosition(), true) && !this.level().getFluidState(this.blockPosition().above()).is(FluidTags.LAVA)) {
                 this.setOnGround(true);
             } else {
-                this.setDeltaMovement(this.getDeltaMovement().scale(0.5).add(0.0, 0.05, 0.0));
+                this.setDeltaMovement(this.getDeltaMovement().scale(0.5D).add(0.0D, 0.05D, 0.0D));
             }
         }
+
     }
 
     public static AttributeSupplier.Builder createAttributes() {
-        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.175F).add(Attributes.FOLLOW_RANGE, 16.0);
+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.17499999701976776D).add(Attributes.FOLLOW_RANGE, 16.0D);
     }
 
     @Override
@@ -387,17 +429,13 @@
 
     @Override
     public float getWalkTargetValue(BlockPos pos, LevelReader world) {
-        if (world.getBlockState(pos).getFluidState().is(FluidTags.LAVA)) {
-            return 10.0F;
-        } else {
-            return this.isInLava() ? Float.NEGATIVE_INFINITY : 0.0F;
-        }
+        return world.getBlockState(pos).getFluidState().is(FluidTags.LAVA) ? 10.0F : (this.isInLava() ? Float.NEGATIVE_INFINITY : 0.0F);
     }
 
     @Nullable
     @Override
-    public Strider getBreedOffspring(ServerLevel serverLevel, AgeableMob ageableMob) {
-        return EntityType.STRIDER.create(serverLevel);
+    public Strider getBreedOffspring(ServerLevel world, AgeableMob entity) {
+        return (Strider) EntityType.STRIDER.create(world);
     }
 
     @Override
@@ -409,74 +447,71 @@
     protected void dropEquipment() {
         super.dropEquipment();
         if (this.isSaddled()) {
-            this.spawnAtLocation(Items.SADDLE);
+            this.spawnAtLocation((ItemLike) Items.SADDLE);
         }
+
     }
 
     @Override
     public InteractionResult mobInteract(Player player, InteractionHand hand) {
-        boolean bl = this.isFood(player.getItemInHand(hand));
-        if (!bl && this.isSaddled() && !this.isVehicle() && !player.isSecondaryUseActive()) {
+        boolean flag = this.isFood(player.getItemInHand(hand));
+
+        if (!flag && this.isSaddled() && !this.isVehicle() && !player.isSecondaryUseActive()) {
             if (!this.level().isClientSide) {
                 player.startRiding(this);
             }
 
             return InteractionResult.sidedSuccess(this.level().isClientSide);
         } else {
-            InteractionResult interactionResult = super.mobInteract(player, hand);
-            if (!interactionResult.consumesAction()) {
-                ItemStack itemStack = player.getItemInHand(hand);
-                return itemStack.is(Items.SADDLE) ? itemStack.interactLivingEntity(player, this, hand) : InteractionResult.PASS;
+            InteractionResult enuminteractionresult = super.mobInteract(player, hand);
+
+            if (!enuminteractionresult.consumesAction()) {
+                ItemStack itemstack = player.getItemInHand(hand);
+
+                return itemstack.is(Items.SADDLE) ? itemstack.interactLivingEntity(player, this, hand) : InteractionResult.PASS;
             } else {
-                if (bl && !this.isSilent()) {
-                    this.level()
-                        .playSound(
-                            null,
-                            this.getX(),
-                            this.getY(),
-                            this.getZ(),
-                            SoundEvents.STRIDER_EAT,
-                            this.getSoundSource(),
-                            1.0F,
-                            1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F
-                        );
+                if (flag && !this.isSilent()) {
+                    this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.STRIDER_EAT, this.getSoundSource(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
                 }
 
-                return interactionResult;
+                return enuminteractionresult;
             }
         }
     }
 
     @Override
     public Vec3 getLeashOffset() {
-        return new Vec3(0.0, (double)(0.6F * this.getEyeHeight()), (double)(this.getBbWidth() * 0.4F));
+        return new Vec3(0.0D, (double) (0.6F * this.getEyeHeight()), (double) (this.getBbWidth() * 0.4F));
     }
 
     @Nullable
     @Override
     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
         if (this.isBaby()) {
-            return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
+            return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
         } else {
-            RandomSource randomSource = world.getRandom();
-            if (randomSource.nextInt(30) == 0) {
-                Mob mob = EntityType.ZOMBIFIED_PIGLIN.create(world.getLevel());
-                if (mob != null) {
-                    entityData = this.spawnJockey(world, difficulty, mob, new Zombie.ZombieGroupData(Zombie.getSpawnAsBabyOdds(randomSource), false));
-                    mob.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.WARPED_FUNGUS_ON_A_STICK));
-                    this.equipSaddle(new ItemStack(Items.SADDLE), null);
+            RandomSource randomsource = world.getRandom();
+
+            if (randomsource.nextInt(30) == 0) {
+                Mob entityinsentient = (Mob) EntityType.ZOMBIFIED_PIGLIN.create(world.getLevel());
+
+                if (entityinsentient != null) {
+                    entityData = this.spawnJockey(world, difficulty, entityinsentient, new Zombie.ZombieGroupData(Zombie.getSpawnAsBabyOdds(randomsource), false));
+                    entityinsentient.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.WARPED_FUNGUS_ON_A_STICK));
+                    this.equipSaddle(new ItemStack(Items.SADDLE), (SoundSource) null);
                 }
-            } else if (randomSource.nextInt(10) == 0) {
-                AgeableMob ageableMob = EntityType.STRIDER.create(world.getLevel());
-                if (ageableMob != null) {
-                    ageableMob.setAge(-24000);
-                    entityData = this.spawnJockey(world, difficulty, ageableMob, null);
+            } else if (randomsource.nextInt(10) == 0) {
+                AgeableMob entityageable = (AgeableMob) EntityType.STRIDER.create(world.getLevel());
+
+                if (entityageable != null) {
+                    entityageable.setAge(-24000);
+                    entityData = this.spawnJockey(world, difficulty, entityageable, (SpawnGroupData) null);
                 }
             } else {
                 entityData = new AgeableMob.AgeableMobGroupData(0.5F);
             }
 
-            return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
+            return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
         }
     }
 
@@ -487,7 +522,8 @@
         return new AgeableMob.AgeableMobGroupData(0.0F);
     }
 
-    static class StriderGoToLavaGoal extends MoveToBlockGoal {
+    private static class StriderGoToLavaGoal extends MoveToBlockGoal {
+
         private final Strider strider;
 
         StriderGoToLavaGoal(Strider strider, double speed) {
@@ -521,7 +557,8 @@
         }
     }
 
-    static class StriderPathNavigation extends GroundPathNavigation {
+    private static class StriderPathNavigation extends GroundPathNavigation {
+
         StriderPathNavigation(Strider entity, Level world) {
             super(entity, world);
         }
@@ -535,7 +572,7 @@
 
         @Override
         protected boolean hasValidPathType(PathType pathType) {
-            return pathType == PathType.LAVA || pathType == PathType.DAMAGE_FIRE || pathType == PathType.DANGER_FIRE || super.hasValidPathType(pathType);
+            return pathType != PathType.LAVA && pathType != PathType.DAMAGE_FIRE && pathType != PathType.DANGER_FIRE ? super.hasValidPathType(pathType) : true;
         }
 
         @Override
