Special case when an entity is teleported in the same chunk

src/main/java/net/minestom/server/entity/Entity.java

@@ -33,6 +33,7 @@ import net.minestom.server.potion.TimedPotion;
 import net.minestom.server.tag.Tag;
 import net.minestom.server.tag.TagHandler;
 import net.minestom.server.thread.ThreadProvider;
+import net.minestom.server.utils.async.AsyncUtils;
 import net.minestom.server.utils.chunk.ChunkUtils;
 import net.minestom.server.utils.entity.EntityUtils;
 import net.minestom.server.utils.player.PlayerUtils;
@@ -239,21 +240,26 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
      *                 can be null or empty to only load the chunk at {@code position}
      * @throws IllegalStateException if you try to teleport an entity before settings its instance
      */
-    public @NotNull CompletableFuture<Void> teleport(@NotNull Pos position, @Nullable long[] chunks) {
+    public @NotNull CompletableFuture<Void> teleport(@NotNull Pos position, long @Nullable [] chunks) {
         Check.stateCondition(instance == null, "You need to use Entity#setInstance before teleporting an entity!");
-        CompletableFuture<Void> completableFuture = new CompletableFuture<>();
         final Runnable endCallback = () -> {
             refreshPosition(position);
             synchronizePosition(true);
-            completableFuture.complete(null);
         };
 
-        if (chunks == null || chunks.length == 0) {
+        if (chunks != null && chunks.length > 0) {
-            instance.loadOptionalChunk(position).thenRun(endCallback);
+            // Chunks need to be loaded before the teleportation can happen
-        } else {
+            return ChunkUtils.optionalLoadAll(instance, chunks, null).thenRun(endCallback);
-            ChunkUtils.optionalLoadAll(instance, chunks, null).thenRun(endCallback);
+        }
+        final Pos currentPosition = this.position;
+        if (!currentPosition.sameChunk(position)) {
+            // Ensure that the chunk is loaded
+            return instance.loadOptionalChunk(position).thenRun(endCallback);
+        } else {
+            // Position is in the same chunk, keep it sync
+            endCallback.run();
+            return AsyncUtils.empty();
         }
-        return completableFuture;
     }
 
     public @NotNull CompletableFuture<Void> teleport(@NotNull Pos position) {

src/main/java/net/minestom/server/utils/location/RelativeVec.java

@@ -57,7 +57,7 @@ public final class RelativeVec {
      */
     public @NotNull Vec from(@Nullable Entity entity) {
         if (entity != null) {
-            return from(entity.getPosition().add(0, entity.getEyeHeight(), 0));
+            return from(entity.getPosition());
         } else {
             return from(Pos.ZERO);
         }