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

49 Zeilen
2.7 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.
== AT ==
public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 52ee3440b09b227bf1f488f374a0e282690f6ba4..007513080938a8d0cf43c050ef4e1132a939918c 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
@@ -334,7 +334,7 @@ public class ServerPlayer extends Player {
2021-11-24 11:04:30 +01:00
this.stats = server.getPlayerList().getPlayerStats(this);
2021-06-11 14:02:28 +02:00
this.advancements = server.getPlayerList().getPlayerAdvancements(this);
2023-03-14 20:54:57 +01:00
this.setMaxUpStep(1.0F);
2021-06-11 14:02:28 +02:00
- 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
@@ -568,7 +568,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
index 56a8c90d3bf0e860acbabcd45957f51f8431317f..ac8882d0d2939bd6e59dc4e08bc1efc88a580360 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
@@ -226,6 +226,7 @@ public abstract class PlayerList {
// Paper
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 14:02:28 +02:00
}
// Paper
2021-06-11 14:02:28 +02:00
player.setLevel(worldserver1);