Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Special case when an entity is teleported in the same chunk

This commit is contained in:
TheMode 2021-08-17 21:58:15 +02:00
parent 460585ae9b
commit 69e8792ce0
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -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) {
instance.loadOptionalChunk(position).thenRun(endCallback);
} else {
ChunkUtils.optionalLoadAll(instance, chunks, null).thenRun(endCallback);
if (chunks != null && chunks.length > 0) {
// Chunks need to be loaded before the teleportation can happen
return 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) {

2
src/main/java/net/minestom/server/utils/location/RelativeVec.java
View File

@ -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);
}