lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed server-sided crash for the turret array (why is Vec2f not found on the server???)

Browse source
This commit is contained in:
WayofTime 2018-04-22 16:04:08 -04:00
parent afcf1a1822
commit 37f9ea2ab2
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changelog.txt
View file

@ -1,3 +1,9 @@
------------------------------------------------------
Version 2.2.10
------------------------------------------------------
- Fixed Turret Array crash on servers.
------------------------------------------------------ ------------------------------------------------------
Version 2.2.9 Version 2.2.9
------------------------------------------------------ ------------------------------------------------------

11
src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java
View file

@ -15,12 +15,13 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec2f;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.Utils;
import com.sun.javafx.geom.Vec2d;
public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect
{ {
public EntityLiving target; public EntityLiving target;
@ -91,7 +92,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect
if (canFireOnMob(world, pos, target)) if (canFireOnMob(world, pos, target))
{ {
Vec2f pitchYaw = getPitchYaw(pos, target); Vec2d pitchYaw = getPitchYaw(pos, target);
lastPitch = pitch; lastPitch = pitch;
lastYaw = yaw; lastYaw = yaw;
pitch = pitchYaw.x; pitch = pitchYaw.x;
@ -179,11 +180,11 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect
} }
} }
public static Vec2f getPitchYaw(BlockPos pos, Entity entityIn) public static Vec2d getPitchYaw(BlockPos pos, Entity entityIn)
{ {
if (entityIn == null) if (entityIn == null)
{ {
return new Vec2f(0, 0); return new Vec2d(0, 0);
} }
double distanceX = entityIn.posX - (pos.getX() + 0.5); double distanceX = entityIn.posX - (pos.getX() + 0.5);
@ -193,7 +194,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect
double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI; double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI;
double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI; double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI;
return new Vec2f((float) pitch, (float) yaw); return new Vec2d((float) pitch, (float) yaw);
} }
public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn)