From 156c8aef9bc49b1ac0f3f303d4087d70684eea59 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 1 Oct 2024 19:42:51 +0100 Subject: [PATCH] Clear some todos --- .../unicopia/ability/UnicornTeleportAbility.java | 4 ++-- .../ability/magic/spell/effect/DisplacementSpell.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java index f7c87b7b..935f297c 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java @@ -178,8 +178,8 @@ public class UnicornTeleportAbility implements Ability { yPos, destination.z() + offset.getZ() ); - // TODO: teleport -> requestTeleport - participant.requestTeleport(dest.x, dest.y, dest.z); + + participant.setPosition(dest); if (participant.getWorld().getBlockCollisions(participant, participant.getBoundingBox()).iterator().hasNext()) { dest = destination.vec(); participant.requestTeleport(dest.x, participant.getY(), dest.z); diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java index 9e2713df..5382fb0c 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java @@ -95,8 +95,7 @@ public class DisplacementSpell extends AbstractSpell implements HomingSpell, Pro } private void teleport(Caster source, Entity entity, Vec3d pos, Vec3d vel) { - // TODO: teleport -> requestTeleport - entity.requestTeleport(pos.x, pos.y, pos.z); + entity.setPosition(pos); entity.setVelocity(vel); entity.setGlowing(false); entity.playSound(USounds.SPELL_DISPLACEMENT_TELEPORT, 1, 1);