Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-27 14:13:24 +02:00
Code Issues Projects Releases Wiki Activity

Fix second setInstance method

Browse Source
This commit is contained in:
TheMode 2021-07-11 13:45:28 +02:00
parent 693a5f3d72
commit b35ab0b667
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -845,7 +845,8 @@ public class Entity implements Viewable, Tickable, EventHandler<EntityEvent>, Da
*
* @param instance the new instance of the entity
* @param spawnPosition the spawn position for the entity.
* @return
* @return a {@link CompletableFuture} called once the entity's instance has been set,
* this is due to chunks needing to load for players
* @throws IllegalStateException if {@code instance} has not been registered in {@link InstanceManager}
*/
public CompletableFuture<Void> setInstance(@NotNull Instance instance, @NotNull Pos spawnPosition) {
@ -872,11 +873,13 @@ public class Entity implements Viewable, Tickable, EventHandler<EntityEvent>, Da
* Changes the entity instance.
*
* @param instance the new instance of the entity
* @return a {@link CompletableFuture} called once the entity's instance has been set,
* this is due to chunks needing to load for players
* @throws NullPointerException if {@code instance} is null
* @throws IllegalStateException if {@code instance} has not been registered in {@link InstanceManager}
*/
public void setInstance(@NotNull Instance instance) {
setInstance(instance, this.position);
public CompletableFuture<Void> setInstance(@NotNull Instance instance) {
return setInstance(instance, this.position);
}
/**

6
src/main/java/net/minestom/server/entity/Player.java
View File

@ -560,11 +560,13 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
* if the player is not in any instance).
*
* @param instance the new player instance
* @return a {@link CompletableFuture} called once the entity's instance has been set,
* this is due to chunks needing to load for players
* @see #setInstance(Instance, Pos)
*/
@Override
public void setInstance(@NotNull Instance instance) {
setInstance(instance, this.instance != null ? getPosition() : getRespawnPoint());
public CompletableFuture<Void> setInstance(@NotNull Instance instance) {
return setInstance(instance, this.instance != null ? getPosition() : getRespawnPoint());
}
/**

6
src/main/java/net/minestom/server/entity/fakeplayer/FakePlayer.java
View File

@ -3,6 +3,7 @@ package net.minestom.server.entity.fakeplayer;
import com.extollit.gaming.ai.path.HydrazinePathFinder;
import net.minestom.server.MinecraftServer;
import net.minestom.server.attribute.Attribute;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.entity.Player;
import net.minestom.server.entity.pathfinding.NavigableEntity;
import net.minestom.server.entity.pathfinding.Navigator;
@ -16,6 +17,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
/**
@ -118,10 +120,10 @@ public class FakePlayer extends Player implements NavigableEntity {
}
@Override
public void setInstance(@NotNull Instance instance) {
public CompletableFuture<Void> setInstance(@NotNull Instance instance, @NotNull Pos spawnPosition) {
this.navigator.setPathFinder(new HydrazinePathFinder(navigator.getPathingEntity(), instance.getInstanceSpace()));
super.setInstance(instance);
return super.setInstance(instance, spawnPosition);
}
@Override