2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Thu, 9 Apr 2020 21:20:33 -0400
|
|
|
|
Subject: [PATCH] Don't move existing players to world spawn
|
|
|
|
|
|
|
|
This can cause a nasty server lag the spawn chunks are not kept loaded
|
|
|
|
or they aren't finished loading yet, or if the world spawn radius is
|
|
|
|
larger than the keep loaded range.
|
|
|
|
|
|
|
|
By skipping this, we avoid potential for a large spike on server start.
|
|
|
|
|
2022-11-19 23:53:20 +00:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
|
|
|
|
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2024-01-16 18:27:39 +00:00
|
|
|
index daedb7b5ef086ccbf091274088170cf7eb331f91..3738680d935695930be19cdc18478c62ccb93d3a 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2023-12-05 22:55:31 +00:00
|
|
|
@@ -385,7 +385,7 @@ public class ServerPlayer extends Player {
|
2021-11-24 10:04:30 +00:00
|
|
|
this.stats = server.getPlayerList().getPlayerStats(this);
|
2021-06-11 12:02:28 +00:00
|
|
|
this.advancements = server.getPlayerList().getPlayerAdvancements(this);
|
2023-03-14 19:54:57 +00:00
|
|
|
this.setMaxUpStep(1.0F);
|
2021-06-11 12:02:28 +00:00
|
|
|
- this.fudgeSpawnLocation(world);
|
2023-09-22 02:31:59 +00:00
|
|
|
+ // this.fudgeSpawnLocation(world); // Paper - don't move to spawn on login, only first join
|
|
|
|
this.updateOptions(clientOptions);
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
|
2023-12-05 22:55:31 +00:00
|
|
|
@@ -619,7 +619,7 @@ public class ServerPlayer extends Player {
|
2023-05-12 11:10:08 +00:00
|
|
|
position = Vec3.atCenterOf(world.getSharedSpawnPos());
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
2023-06-07 22:41:25 +00:00
|
|
|
this.setLevel(world);
|
2023-05-12 11:10:08 +00:00
|
|
|
- this.setPos(position);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ this.setPosRaw(position.x(), position.y(), position.z()); // Paper - don't register to chunks yet
|
|
|
|
}
|
|
|
|
this.gameMode.setLevel((ServerLevel) world);
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2024-01-16 18:27:39 +00:00
|
|
|
index d4ae0a201838dbc9c73f7c1a8a67072b344b71bc..03f8e1775e05293665f995b6c3ee52ed11447e79 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2023-12-05 22:55:31 +00:00
|
|
|
@@ -226,6 +226,7 @@ public abstract class PlayerList {
|
2023-04-06 22:39:32 +00:00
|
|
|
// Paper start
|
2023-04-02 18:37:53 +00:00
|
|
|
if (nbttagcompound == null) {
|
|
|
|
player.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; // set Player SpawnReason to DEFAULT on first login
|
|
|
|
+ player.fudgeSpawnLocation(worldserver1); // only move to spawn on first login, otherwise, stay where you are....
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
2023-04-06 22:39:32 +00:00
|
|
|
// Paper end
|
2023-06-07 22:41:25 +00:00
|
|
|
player.setServerLevel(worldserver1);
|