diff --git a/src/main/java/com/majruszsdifficulty/gamemodifiers/list/SpawnPlayerZombie.java b/src/main/java/com/majruszsdifficulty/gamemodifiers/list/SpawnPlayerZombie.java index e9719901b..2355dcea3 100644 --- a/src/main/java/com/majruszsdifficulty/gamemodifiers/list/SpawnPlayerZombie.java +++ b/src/main/java/com/majruszsdifficulty/gamemodifiers/list/SpawnPlayerZombie.java @@ -57,7 +57,7 @@ public SpawnPlayerZombie() { private void spawnZombie( OnDeath.Data data ) { Player player = ( Player )data.target; EntityType< ? extends Zombie > zombieType = getZombieType( data.attacker ); - Zombie zombie = zombieType.spawn( data.getServerLevel(), ( CompoundTag )null, null, player.blockPosition(), MobSpawnType.EVENT, true, true ); + Zombie zombie = zombieType.spawn( data.getServerLevel(), ( CompoundTag )null, null, null, player.blockPosition(), MobSpawnType.EVENT, true, true ); if( zombie == null ) return; diff --git a/src/main/java/com/majruszsdifficulty/gamemodifiers/list/TurnSkeletonIntoWitherSkeleton.java b/src/main/java/com/majruszsdifficulty/gamemodifiers/list/TurnSkeletonIntoWitherSkeleton.java index 19f2bad01..ccdd7912a 100644 --- a/src/main/java/com/majruszsdifficulty/gamemodifiers/list/TurnSkeletonIntoWitherSkeleton.java +++ b/src/main/java/com/majruszsdifficulty/gamemodifiers/list/TurnSkeletonIntoWitherSkeleton.java @@ -61,7 +61,7 @@ private void spawnWitherSkeleton( OnDeath.Data data ) { ParticleHandler.SOUL.spawn( level, position, 100, ParticleHandler.offset( 1.0f ) ); } if( slider.isFinished() ) { - EntityType.WITHER_SKELETON.spawn( level, ( CompoundTag )null, null, new BlockPos( data.target.position() ), MobSpawnType.EVENT, true, true ); + EntityType.WITHER_SKELETON.spawn( level, ( CompoundTag )null, null, null, new BlockPos( data.target.position() ), MobSpawnType.EVENT, true, true ); } } ); } diff --git a/src/main/java/com/majruszsdifficulty/goals/UndeadArmyAttackPositionGoal.java b/src/main/java/com/majruszsdifficulty/goals/UndeadArmyAttackPositionGoal.java index a606e8f0e..46dfebc65 100644 --- a/src/main/java/com/majruszsdifficulty/goals/UndeadArmyAttackPositionGoal.java +++ b/src/main/java/com/majruszsdifficulty/goals/UndeadArmyAttackPositionGoal.java @@ -5,7 +5,6 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.entity.ai.navigation.PathNavigation; -import net.minecraft.world.phys.Vec3; public class UndeadArmyAttackPositionGoal extends Goal { final Mob undead; @@ -56,7 +55,7 @@ private boolean hasAnyTarget() { } private double getDistanceToAttackPosition() { - return AnyPos.from( this.undead.position() ).dist2d( this.attackPosition.getCenter() ).doubleValue(); + return AnyPos.from( this.undead.position() ).dist2d( AnyPos.from( this.attackPosition ).center() ).doubleValue(); } } diff --git a/src/main/java/com/majruszsdifficulty/models/CerberusModel.java b/src/main/java/com/majruszsdifficulty/models/CerberusModel.java index e3fab0766..22db453d1 100644 --- a/src/main/java/com/majruszsdifficulty/models/CerberusModel.java +++ b/src/main/java/com/majruszsdifficulty/models/CerberusModel.java @@ -5,6 +5,7 @@ import com.mlib.animations.Frame; import com.mlib.animations.InterpolationType; import com.mlib.math.AnyPos; +import com.mojang.math.Vector3f; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HierarchicalModel; import net.minecraft.client.model.geom.ModelPart; @@ -14,7 +15,6 @@ import net.minecraft.util.Mth; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import org.joml.Vector3f; @OnlyIn( Dist.CLIENT ) public class CerberusModel< Type extends CerberusEntity > extends HierarchicalModel< Type > { diff --git a/src/main/java/com/majruszsdifficulty/undeadarmy/UndeadArmy.java b/src/main/java/com/majruszsdifficulty/undeadarmy/UndeadArmy.java index e3b1dc8ef..78967addf 100644 --- a/src/main/java/com/majruszsdifficulty/undeadarmy/UndeadArmy.java +++ b/src/main/java/com/majruszsdifficulty/undeadarmy/UndeadArmy.java @@ -97,7 +97,7 @@ public void setState( Phase.State state, int ticksLeft ) { } public double distanceTo( BlockPos position ) { - return AnyPos.from( position.getCenter() ).dist2d( this.positionToAttack.getCenter() ).doubleValue(); + return AnyPos.from( position ).center().dist2d( AnyPos.from( this.positionToAttack ).center() ).doubleValue(); } public boolean hasFinished() {