Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-31 21:48:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix different spawn pos check

Browse Source
This commit is contained in:
Németh Noel 2021-05-05 23:55:01 +02:00
parent 2f1ada9a9f
commit d360904f77
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,13 +612,13 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
// Only load the spawning chunk to speed up login, remaining chunks are loaded in #spawnPlayer
final long[] visibleChunks = ChunkUtils.getChunksInRange(spawnPosition, 0);
final ChunkCallback endCallback = chunk -> spawnPlayer(instance, spawnPosition, firstSpawn, true, dimensionChange);
final ChunkCallback endCallback = chunk -> spawnPlayer(instance, spawnPosition, firstSpawn, dimensionChange);
ChunkUtils.optionalLoadAll(instance, visibleChunks, null, endCallback);
} else {
// The player already has the good version of all the chunks.
// We just need to refresh his entity viewing list and add him to the instance
spawnPlayer(instance, spawnPosition, false, false, false);
spawnPlayer(instance, spawnPosition, false, false);
}
}
@ -645,21 +645,19 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
* @param firstSpawn true if this is the player first spawn
*/
private void spawnPlayer(@NotNull Instance instance, @NotNull Position spawnPosition,
boolean firstSpawn, boolean updateChunks, boolean dimensionChange) {
boolean firstSpawn, boolean dimensionChange) {
// Clear previous instance elements
if (!firstSpawn) {
this.viewableChunks.forEach(chunk -> chunk.removeViewer(this));
this.viewableEntities.forEach(entity -> entity.removeViewer(this));
}
final boolean differentSpawnPos = !position.isSimilar(spawnPosition);
super.setInstance(instance, spawnPosition);
if (!position.isSimilar(spawnPosition) && !firstSpawn) {
if (differentSpawnPos && !firstSpawn) {
// Player changed instance at a different position
teleport(spawnPosition);
} else if (updateChunks) {
// Send newly visible chunks to player once spawned in the instance
refreshVisibleChunks();
}
if (dimensionChange || firstSpawn) {