Merge branch 'mc1.15/dev' into mc1.16/dev

This commit is contained in:
simibubi 2021-01-13 15:50:32 +01:00
commit 877d6dc2ee

View file

@ -24,6 +24,7 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.DamageSource;
import net.minecraft.util.LazyValue;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult.Type;
import net.minecraft.util.math.vector.Vector3d;
@ -122,6 +123,8 @@ public class ExtendoGripItem extends Item {
return;
if (!isHoldingExtendoGrip(player))
return;
if (mc.objectMouseOver instanceof BlockRayTraceResult && mc.objectMouseOver.getType() != Type.MISS)
return;
// Modified version of GameRenderer#getMouseOver
double d0 = player.getAttribute(ForgeMod.REACH_DISTANCE.get())