diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch index 43754433f..24bac246e 100644 --- a/patches/server/0007-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -2317,25 +2317,9 @@ index fdd2c63ff0017bafa544a3cff2ee6d2d62c92cb3..32b31e5efb5fc68430b9bcd4cd972494 } 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 9e17e21a48892686e94a1c21b636695ab84eb7cd..156ab5e6a8e75e55f0f3fbc84c21e397cd1dc589 100644 +index 9e17e21a48892686e94a1c21b636695ab84eb7cd..c88222d120c71649b2e43a20f119590106734596 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 -@@ -43,7 +43,6 @@ import net.minecraft.world.entity.SpawnGroupData; - import net.minecraft.world.entity.ai.Brain; - import net.minecraft.world.entity.ai.attributes.AttributeSupplier; - import net.minecraft.world.entity.ai.attributes.Attributes; --import net.minecraft.world.entity.ai.control.LookControl; - import net.minecraft.world.entity.ai.control.SmoothSwimmingMoveControl; - import net.minecraft.world.entity.ai.memory.MemoryModuleType; - import net.minecraft.world.entity.ai.navigation.AmphibiousPathNavigation; -@@ -53,6 +52,7 @@ import net.minecraft.world.entity.ai.sensing.SensorType; - import net.minecraft.world.entity.animal.Animal; - import net.minecraft.world.entity.animal.FrogVariant; - import net.minecraft.world.entity.monster.Slime; -+import net.minecraft.world.entity.player.Player; - import net.minecraft.world.item.ItemStack; - import net.minecraft.world.item.Items; - import net.minecraft.world.item.crafting.Ingredient; @@ -83,16 +83,65 @@ public class Frog extends Animal { public final AnimationState walkAnimationState = new AnimationState(); public final AnimationState swimAnimationState = new AnimationState(); @@ -2355,7 +2339,7 @@ index 9e17e21a48892686e94a1c21b636695ab84eb7cd..156ab5e6a8e75e55f0f3fbc84c21e397 + this.moveControl = new SmoothSwimmingMoveControl(this, 85, 10, 0.02F, 0.1F, true) { + @Override + public void tick() { -+ Player rider = mob.getRider(); ++ net.minecraft.world.entity.player.Player rider = mob.getRider(); + if (rider != null && mob.isControllable()) { + if (mob.isInWater()) { + purpurWaterController.purpurTick(rider);