mmo-ref/mc-paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper synced 2026-08-20 18:26:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add internal API to configure pending player network id (#14051)

Browse source 
Co-authored-by: Bjarne Koll <git@lynxplay.dev>
This commit is contained in:
Panda 2026-07-26 11:07:56 +03:00 • committed by GitHub
parent d5c888a77d
commit 26a624bc52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
paper-server/patches/sources/net/minecraft/server/network/config/PrepareSpawnTask.java.patch
View file

@ -156,7 +156,7 @@
ChunkPos spawnChunk = ChunkPos.containing(BlockPos.containing(spawnPosition));
this.chunkLoadCounter
.track(
@@ -172,14 +_,47 @@
@@ -172,14 +_,48 @@
public ServerPlayer spawn(final Connection connection, final CommonListenerCookie cookie) {
ChunkPos spawnChunk = ChunkPos.containing(BlockPos.containing(this.spawnPosition));
this.spawnLevel.waitForEntities(spawnChunk, 3);
@ -174,6 +174,7 @@
+ player = new ServerPlayer(PrepareSpawnTask.this.server, this.spawnLevel, cookie.gameProfile(), cookie.clientInformation());
+ }
+ // Paper end - configuration api - possibly use legacy saved server player instance
+ PrepareSpawnTask.this.listener.paperConnection.applyPendingEntityId(player); // Paper - internal entity id api - possibly override player network id if plugins used internal API to configure it.
try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(player.problemPath(), PrepareSpawnTask.LOGGER)) {
Optional<ValueInput> input = PrepareSpawnTask.this.server

23
paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerConfigurationConnection.java
View file

@ -31,6 +31,7 @@ import net.minecraft.network.protocol.common.custom.DiscardedPayload;
import net.minecraft.network.protocol.configuration.ClientboundResetChatPacket;
import net.minecraft.resources.Identifier;
import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ConfigurationTask;
import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
import org.bukkit.plugin.Plugin;
@ -40,11 +41,33 @@ import org.jspecify.annotations.Nullable;
public class PaperPlayerConfigurationConnection extends PaperCommonConnection<ServerConfigurationPacketListenerImpl> implements PlayerConfigurationConnection, Audience, PluginMessageBridgeImpl {
private @Nullable Pointers adventurePointers;
private @Nullable Integer internalPluginDefinedEntityId;
public PaperPlayerConfigurationConnection(final ServerConfigurationPacketListenerImpl packetListener) {
super(packetListener);
}
/**
* Internal only API that allows plugins to assign a specific entity network id to the player instance once
* configuration phase finishes.
* <p>
* It is fully up to the calling plugin to ensure that no other entity has or will have the passed entity id.
* Additionally, as with any other internal API, no backwards compatibility is guaranteed across versions or builds.
* Use at own risk.
*
* @param entityId the network entity id to assign to the player.
*/
public void setInternalPluginDefinedEntityId(final int entityId) {
this.internalPluginDefinedEntityId = entityId;
}
// Part of the above internal API.
public void applyPendingEntityId(final ServerPlayer player) {
if (this.internalPluginDefinedEntityId != null) {
player.setId(this.internalPluginDefinedEntityId);
}
}
@Override
public ClientInformation getClientInformation() {
return this.packetListener.clientInformation;