From dd297d6e42fd5040a275de129285c5ffcf54fd00 Mon Sep 17 00:00:00 2001 From: Chicken-Bomes Date: Wed, 30 Oct 2013 12:23:03 +1000 Subject: [PATCH] Fix RayTracer with non EntityPlayerMP instances on server worlds. --- codechicken/lib/raytracer/RayTracer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/codechicken/lib/raytracer/RayTracer.java b/codechicken/lib/raytracer/RayTracer.java index 2be94e6..9d534aa 100644 --- a/codechicken/lib/raytracer/RayTracer.java +++ b/codechicken/lib/raytracer/RayTracer.java @@ -209,7 +209,7 @@ public class RayTracer public static MovingObjectPosition reTrace(World world, EntityPlayer player) { - return reTrace(world, player, world.isRemote ? getBlockReachDistance_client() : getBlockReachDistance_server((EntityPlayerMP) player)); + return reTrace(world, player, getBlockReachDistance(player)); } public static MovingObjectPosition reTrace(World world, EntityPlayer player, double reach) @@ -238,7 +238,8 @@ public class RayTracer public static double getBlockReachDistance(EntityPlayer player) { - return player.worldObj.isRemote ? getBlockReachDistance_client() : getBlockReachDistance_server((EntityPlayerMP) player); + return player.worldObj.isRemote ? getBlockReachDistance_client() : + player instanceof EntityPlayerMP ? getBlockReachDistance_server((EntityPlayerMP) player) : 5D; } public static Vec3 getEndVec(EntityPlayer player)