Other fixes

Author: Spectrall368

src/main/resources/forge-1.14.4/aitasks/avoid_entity.java.ftl

@@ -1,2 +1,3 @@
 <#include "aiconditions.java.ftl">
-this.goalSelector.addGoal(${cbi+1}, new AvoidEntityGoal<>(this, ${generator.map(field$entity, "entities")}.class, (float)${field$radius}, ${field$farspeed}, ${field$nearspeed})<@conditionCode field$condition/>);
+this.goalSelector.addGoal(${cbi+1},
+        new AvoidEntityGoal(this, ${generator.map(field$entity, "entities")}.class, (float)${field$radius}, ${field$farspeed}, ${field$nearspeed})<@conditionCode field$condition/>);

src/main/resources/forge-1.14.4/aitasks/follow_owner.java.ftl

@@ -1,4 +1,4 @@
 <#if (data.tameable && data.breedable && (!data.waterMob || data.flyingMob))>
 <#include "aiconditions.java.ftl">
-this.goalSelector.addGoal(${cbi+1}, new FollowOwnerGoal(this, ${field$speed}, (float) ${field$min_distance}, (float) ${field$max_distance}, false)<@conditionCode field$condition/>);
-</#if>
+this.goalSelector.addGoal(${cbi+1}, new FollowOwnerGoal(this, ${field$speed}, (float) ${field$min_distance}, (float) ${field$max_distance})<@conditionCode field$condition/>);
+</#if>

src/main/resources/forge-1.14.4/templates/livingentity/livingentity.java.ftl

@@ -880,7 +880,7 @@ public class ${name}Entity extends ${extendsClass}Entity <#if interfaces?size gt
 					}
 					<#else>
 					(entityType, world, reason, pos, random) ->
-							(world.getBlockState(pos).isIn(Blocks.WATER) && world.getBlockState(pos.up()).isIn(Blocks.WATER))
+							(world.getBlockState(pos) == Blocks.WATER && world.getBlockState(pos.up()) == Blocks.WATER)
 					</#if>
 			);
 			<#elseif data.mobSpawningType == "undergroundWaterCreature">
@@ -895,7 +895,7 @@ public class ${name}Entity extends ${extendsClass}Entity <#if interfaces?size gt
 					}
 					<#else>
 					(entityType, world, reason, pos, random) -> {
-					    return world.getFluidState(pos.down()).isTagged(FluidTags.WATER) && world.getBlockState(pos.up()).isIn(Blocks.WATER) && pos.getY() >= (world.getSeaLevel() - 13) && pos.getY() <= world.getSeaLevel();
+					    return world.getFluidState(pos.down()).isTagged(FluidTags.WATER) && world.getBlockState(pos.up()) == Blocks.WATER && pos.getY() >= (world.getSeaLevel() - 13) && pos.getY() <= world.getSeaLevel();
                     }
 					</#if>
 			);