testserver/patches/server/0383-Don-t-move-existing-pl...

47 lines
2.4 KiB
Diff
Raw Normal View History

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.
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2022-07-27 20:17:18 +00:00
index 2b2810ee58eea7b703cb46690752f02c49cc0376..104d8dd2941da8153fdeb799c48f884c33e3e585 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
2022-07-27 20:17:18 +00:00
@@ -322,7 +322,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);
this.maxUpStep = 1.0F;
- this.fudgeSpawnLocation(world);
2021-11-24 10:04:30 +00:00
+ //this.fudgeSpawnLocation(world); // Paper - don't move to spawn on login, only first join
2021-06-11 12:02:28 +00:00
this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
2021-06-13 22:05:18 +00:00
2022-07-27 20:17:18 +00:00
@@ -540,7 +540,7 @@ public class ServerPlayer extends Player {
2021-06-13 22:05:18 +00:00
position = Vec3.atCenterOf(((ServerLevel) world).getSharedSpawnPos());
2021-06-11 12:02:28 +00:00
}
this.level = world;
- this.setPos(position.x(), position.y(), position.z());
+ 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
2022-07-27 20:17:18 +00:00
index f1bbfb0acbe79304b2e1c10221bc31b162e63959..ca89bb5bf4de85ca22b004c91f2c7501bb133c55 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
2022-07-27 20:17:18 +00:00
@@ -215,6 +215,8 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
worldserver1 = worldserver;
}
2021-06-13 22:05:18 +00:00
+ if (nbttagcompound == null) player.fudgeSpawnLocation(worldserver1); // Paper - only move to spawn on first login, otherwise, stay where you are....
2021-06-11 12:02:28 +00:00
+
player.setLevel(worldserver1);
String s1 = "local";
2021-06-13 22:05:18 +00:00