Upstream/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2024-11-30 13:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
7f0a317854
Folia/patches/server/0017-Sync-vehicle-position-to-player-position-on-player-d.patch

27 lines
1.7 KiB
Diff
Raw Normal View History

Fix some issues from Folia test Player spawn position changing caused any player to log in while on a boat to trip a thread check. To resolve this, simply reposition any mounted entities if they are more than 5 blocks away from the player. In general, this may happen to other entities that are loaded from chunks as well. In these cases, we can delete the entity if it itself is not saved in the correct chunk, and we can reposition the mounted entities if they are not in the correct chunk. For tile entities, we can simply remove them if they are not in the chunk. These changes broadly should make loading player/chunk data more resiliant to bad logic run by plugins. Also, the Folia test revealed that the chunk generate rate limiter also affected chunk loading, which was not intended and has been resolved by exempting already FULL status chunks from the limit.
2023-06-25 23:01:20 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 25 Jun 2023 13:57:30 -0700
Subject: [PATCH] Sync vehicle position to player position on player data load
This allows the player to be re-positioned before logging into
the world without causing thread checks to trip on Folia.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
Update Paper Also included is a fix to Connection#handleDisconnection using the wrong login state for removing pending login
2024-02-05 20:41:39 +01:00
index 93e192ea1a0cda2d7aae983980a6fead013c8b90..b19f1db38e71d9185cca9fc0e44937f91443a042 100644
Fix some issues from Folia test Player spawn position changing caused any player to log in while on a boat to trip a thread check. To resolve this, simply reposition any mounted entities if they are more than 5 blocks away from the player. In general, this may happen to other entities that are loaded from chunks as well. In these cases, we can delete the entity if it itself is not saved in the correct chunk, and we can reposition the mounted entities if they are not in the correct chunk. For tile entities, we can simply remove them if they are not in the chunk. These changes broadly should make loading player/chunk data more resiliant to bad logic run by plugins. Also, the Folia test revealed that the chunk generate rate limiter also affected chunk loading, which was not intended and has been resolved by exempting already FULL status chunks from the limit.
2023-06-25 23:01:20 +02:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
Apply patches for 1.20.4 - Compile needs to be checked. - Behaviors around the new tick manager need to be designed and implemented. Chk update.txt for anything specific.
2023-12-17 00:32:48 +01:00
@@ -514,7 +514,13 @@ public abstract class PlayerList {
Fix some issues from Folia test Player spawn position changing caused any player to log in while on a boat to trip a thread check. To resolve this, simply reposition any mounted entities if they are more than 5 blocks away from the player. In general, this may happen to other entities that are loaded from chunks as well. In these cases, we can delete the entity if it itself is not saved in the correct chunk, and we can reposition the mounted entities if they are not in the correct chunk. For tile entities, we can simply remove them if they are not in the chunk. These changes broadly should make loading player/chunk data more resiliant to bad logic run by plugins. Also, the Folia test revealed that the chunk generate rate limiter also affected chunk loading, which was not intended and has been resolved by exempting already FULL status chunks from the limit.
2023-06-25 23:01:20 +02:00
CompoundTag nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
// CraftBukkit start
ServerLevel finalWorldServer = worldserver1;
+ Vec3 playerPos = player.position(); // Paper - force sync root vehicle to player position
Entity entity = EntityType.loadEntityRecursive(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
+ // Paper start - force sync root vehicle to player position
+ if (entity1.distanceToSqr(player) > (5.0 * 5.0)) {
+ entity1.setPosRaw(playerPos.x, playerPos.y, playerPos.z, true);
+ }
+ // Paper end - force sync root vehicle to player position
Update Paper Also included is a fix to Connection#handleDisconnection using the wrong login state for removing pending login
2024-02-05 20:41:39 +01:00
return !finalWorldServer.addWithUUID(entity1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity1; // Paper - Entity#getEntitySpawnReason
Fix some issues from Folia test Player spawn position changing caused any player to log in while on a boat to trip a thread check. To resolve this, simply reposition any mounted entities if they are more than 5 blocks away from the player. In general, this may happen to other entities that are loaded from chunks as well. In these cases, we can delete the entity if it itself is not saved in the correct chunk, and we can reposition the mounted entities if they are not in the correct chunk. For tile entities, we can simply remove them if they are not in the chunk. These changes broadly should make loading player/chunk data more resiliant to bad logic run by plugins. Also, the Folia test revealed that the chunk generate rate limiter also affected chunk loading, which was not intended and has been resolved by exempting already FULL status chunks from the limit.
2023-06-25 23:01:20 +02:00
// CraftBukkit end
});
Reference in New Issue Copy Permalink