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.
|
|
|
|
|
2022-11-20 00:53:20 +01:00
|
|
|
== 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
|
2024-06-13 22:14:13 +02:00
|
|
|
index d2f5ff035d4d496c035b8ae0c04c67e3de78fd4b..142bdd74f930a1a2a004c8b6d9435318d1a07b71 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
|
2024-06-13 22:14:13 +02:00
|
|
|
@@ -358,7 +358,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
2024-04-24 08:05:14 +02:00
|
|
|
this.server = server;
|
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);
|
2024-06-13 22:14:13 +02:00
|
|
|
- this.moveTo(this.adjustSpawnLocation(world, world.getSharedSpawnPos()).getBottomCenter(), 0.0F, 0.0F);
|
|
|
|
+ // this.moveTo(this.adjustSpawnLocation(world, world.getSharedSpawnPos()).getBottomCenter(), 0.0F, 0.0F); // Paper - Don't move existing players to world spawn
|
2023-09-22 04:31:59 +02:00
|
|
|
this.updateOptions(clientOptions);
|
2024-04-24 08:05:14 +02:00
|
|
|
this.object = null;
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-06-13 22:14:13 +02:00
|
|
|
@@ -630,7 +630,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
2023-05-12 13:10:08 +02:00
|
|
|
position = Vec3.atCenterOf(world.getSharedSpawnPos());
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2023-06-08 00:41:25 +02:00
|
|
|
this.setLevel(world);
|
2023-05-12 13:10:08 +02:00
|
|
|
- this.setPos(position);
|
2021-06-11 14:02:28 +02: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-06-13 22:14:13 +02:00
|
|
|
index 7fa13f1fe02a1bdfa93c76e9c2eefc81c9bded50..5cc92a5f55a9492928c4ba140d4e45dcf75b5431 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
|
2024-04-24 08:05:14 +02:00
|
|
|
@@ -226,6 +226,7 @@ public abstract class PlayerList {
|
2024-01-21 13:56:22 +01:00
|
|
|
// Paper start - Entity#getEntitySpawnReason
|
2024-04-24 08:44:48 +02:00
|
|
|
if (optional.isEmpty()) {
|
2023-04-02 20:37:53 +02:00
|
|
|
player.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; // set Player SpawnReason to DEFAULT on first login
|
2024-06-13 22:14:13 +02:00
|
|
|
+ player.moveTo(player.adjustSpawnLocation(worldserver1, worldserver1.getSharedSpawnPos()).getBottomCenter(), 0.0F, 0.0F);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2024-01-21 13:56:22 +01:00
|
|
|
// Paper end - Entity#getEntitySpawnReason
|
2023-06-08 00:41:25 +02:00
|
|
|
player.setServerLevel(worldserver1);
|