Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

fix: teleport staff to the correct location 🤦

Browse source
This commit is contained in:
Michael Hillcox 2022-03-13 19:46:40 +00:00
parent fdda08b593
commit b0c1e8e8cc
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java
View file

@ -18,10 +18,9 @@ import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents; import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.vector.Vector3i;
import net.minecraft.world.World; import net.minecraft.world.World;
public class ItemTeleStaff extends ItemEnergy { public class ItemTeleStaff extends ItemEnergy {
@ -34,14 +33,14 @@ public class ItemTeleStaff extends ItemEnergy {
public ActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) { public ActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
ItemStack stack = player.getItemInHand(hand); ItemStack stack = player.getItemInHand(hand);
if (!world.isClientSide) { if (!world.isClientSide) {
RayTraceResult rayTraceResult = player.pick(100,0,false); RayTraceResult rayTraceResult = player.pick(100,1F,false);
if (rayTraceResult != null && (rayTraceResult.getType() == RayTraceResult.Type.BLOCK || player.xRot >= -5)) { if (rayTraceResult.getType() == RayTraceResult.Type.BLOCK || player.xRot >= -5) {
BlockRayTraceResult res = (BlockRayTraceResult)rayTraceResult; Vector3d location = rayTraceResult.getLocation();
BlockPos pos = res.getBlockPos().relative(res.getDirection()); Vector3d pos = Vector3d.atBottomCenterOf(new Vector3i(location.x, location.y, location.z));
int baseUse = 200; int baseUse = 200;
int use = baseUse + (int) (baseUse * rayTraceResult.getLocation().distanceTo(new Vector3d(player.getX(), player.getY() + (player.getEyeHeight() - player.getEyeHeight()), player.getZ()))); int use = baseUse + (int) (baseUse * player.blockPosition().distSqr(new Vector3i(pos.x, pos.y, pos.z)));
if (this.getEnergyStored(stack) >= use) { if (this.getEnergyStored(stack) >= use) {
((ServerPlayerEntity) player).connection.teleport(pos.getX(), pos.getY(), pos.getY(), player.yRot, player.xRot); ((ServerPlayerEntity) player).connection.teleport(pos.x, pos.y + 1F, pos.z, player.yRot, player.xRot);
player.removeVehicle(); player.removeVehicle();
world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1.0F, 1.0F); world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1.0F, 1.0F);
if (!player.isCreative()) { if (!player.isCreative()) {