Skip to content

🐛 fix(network): don't remove player twice when disconnected during config switch - #14346

Merged
kennytv merged 1 commit into
PaperMC:mainfrom
twisti-dev:fix/double-removal-of-player-during-config-reentering-disconnect
Oct 5, 2026
Merged

kennytv merged 1 commit into
PaperMC:mainfrom
twisti-dev:fix/double-removal-of-player-during-config-reentering-disconnect

Conversation

@twisti-dev

Copy link
Copy Markdown

Fixes the server crash when a player disconnects during configuration reenter (#14119).

Previously, the server would crash when a player disconnected or was kicked during configuration reentry because the player's entity scheduler had already been retired.

This fix is essentially the same as the one folia implemented here 0001-Region-Threading-Base.patch

@twisti-dev
twisti-dev requested a review from a team as a code owner October 4, 2026 15:50
Copilot AI balanced review requested due to automatic review settings October 4, 2026 15:50

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@kennytv
kennytv enabled auto-merge (squash) October 5, 2026 15:13
@kennytv
kennytv merged commit 65c408a into PaperMC:main Oct 5, 2026
6 checks passed
WinPlay02 added a commit to WoMa-Entertainment/Icicle that referenced this pull request Oct 5, 2026
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@288d43e1 Add getInstrument method to BlockType PaperMC/Paper#14251
PaperMC/Paper@6bc56abc Add `throws CommandSyntaxException` to BasicCommand PaperMC/Paper#14339
PaperMC/Paper@a9d03827 Fix startup crash using autoEnableOnServerStart in plugin-provided datapacks PaperMC/Paper#14238
PaperMC/Paper@ddb45eb4 Fix incorrect container setChanged() called in optimized hopper patch PaperMC/Paper#14269
PaperMC/Paper@60c8e563 Force absolute positions for item frames
PaperMC/Paper@1d254ec4 Fix adding entities with api with already valid passengers PaperMC/Paper#14336
PaperMC/Paper@371c96aa Fix username duplication in chat when defaultRenderer is explicitly set PaperMC/Paper#13868
PaperMC/Paper@6e88e469 Fix possible CME race conditions for post effects PaperMC/Paper#14335
PaperMC/Paper@1a7b6265 Bump JLine to 4.4.6, drop JNI backend as Paper compiles to Java 25 PaperMC/Paper#14323
PaperMC/Paper@1dbde610 Make test block codec conditional
PaperMC/Paper@780818ff  Clear bucket empty event result when fluid placement fails PaperMC/Paper#14345
PaperMC/Paper@2de3a930 Fix silent ignore of Block#getState(boolean) parameter PaperMC/Paper#14341
PaperMC/Paper@65c408ad Don't remove player twice when disconnected during config switch PaperMC/Paper#14346
PaperMC/Paper@4728a906 Fix bundle contents corruption with item obfuscation and shelves PaperMC/Paper#14352
granny added a commit to PurpurMC/Purpur that referenced this pull request Oct 6, 2026
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@288d43e1 Add getInstrument method to BlockType PaperMC/Paper#14251
PaperMC/Paper@6bc56abc Add `throws CommandSyntaxException` to BasicCommand PaperMC/Paper#14339
PaperMC/Paper@a9d03827 Fix startup crash using autoEnableOnServerStart in plugin-provided datapacks PaperMC/Paper#14238
PaperMC/Paper@ddb45eb4 Fix incorrect container setChanged() called in optimized hopper patch PaperMC/Paper#14269
PaperMC/Paper@60c8e563 Force absolute positions for item frames
PaperMC/Paper@1d254ec4 Fix adding entities with api with already valid passengers PaperMC/Paper#14336
PaperMC/Paper@371c96aa Fix username duplication in chat when defaultRenderer is explicitly set PaperMC/Paper#13868
PaperMC/Paper@6e88e469 Fix possible CME race conditions for post effects PaperMC/Paper#14335
PaperMC/Paper@1a7b6265 Bump JLine to 4.4.6, drop JNI backend as Paper compiles to Java 25 PaperMC/Paper#14323
PaperMC/Paper@1dbde610 Make test block codec conditional
PaperMC/Paper@780818ff  Clear bucket empty event result when fluid placement fails PaperMC/Paper#14345
PaperMC/Paper@2de3a930 Fix silent ignore of Block#getState(boolean) parameter PaperMC/Paper#14341
PaperMC/Paper@65c408ad Don't remove player twice when disconnected during config switch PaperMC/Paper#14346
PaperMC/Paper@4728a906 Fix bundle contents corruption with item obfuscation and shelves PaperMC/Paper#14352
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Merged

Development

Successfully merging this pull request may close these issues.

3 participants