Paper/patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch

47 Zeilen
2.4 KiB
Diff

2021-06-11 14:02:28 +02: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
2021-11-24 11:04:30 +01:00
index fd609c7b757b570206c17444867f786c1767aa69..d507adcb538933fcf36e9a4bfb561106d509c26f 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2021-11-24 11:04:30 +01:00
@@ -313,7 +313,7 @@ public class ServerPlayer extends Player {
this.stats = server.getPlayerList().getPlayerStats(this);
2021-06-11 14:02:28 +02:00
this.advancements = server.getPlayerList().getPlayerAdvancements(this);
this.maxUpStep = 1.0F;
- this.fudgeSpawnLocation(world);
2021-11-24 11:04:30 +01:00
+ //this.fudgeSpawnLocation(world); // Paper - don't move to spawn on login, only first join
2021-06-11 14:02:28 +02:00
this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
2021-06-14 00:05:18 +02:00
2021-11-24 11:04:30 +01:00
@@ -531,7 +531,7 @@ public class ServerPlayer extends Player {
2021-06-14 00:05:18 +02:00
position = Vec3.atCenterOf(((ServerLevel) world).getSharedSpawnPos());
2021-06-11 14:02:28 +02: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
2021-11-29 12:55:13 +01:00
index 33b607227718e08f26d7ab5744bbbff806f33366..e1d729d86d11f9bc9452b7382f12aeb668c19936 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2021-07-07 08:52:40 +02:00
@@ -210,6 +210,8 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
worldserver1 = worldserver;
}
2021-06-14 00:05:18 +02:00
+ if (nbttagcompound == null) player.fudgeSpawnLocation(worldserver1); // Paper - only move to spawn on first login, otherwise, stay where you are....
2021-06-11 14:02:28 +02:00
+
player.setLevel(worldserver1);
String s1 = "local";
2021-06-14 00:05:18 +02:00