Skip to content

fix(folia): port WorldGuard #2321, #2325 and #2330 for 1.21.11 - #3

Draft
Namnarak wants to merge 5 commits into
folia/1.21.11from
fix/folia-worldguard-cross-region-20261103
Draft

Namnarak wants to merge 5 commits into
folia/1.21.11from
fix/folia-worldguard-cross-region-20261103

Conversation

@Namnarak

@Namnarak Namnarak commented Nov 3, 2026 •

Copy link
Copy Markdown

Ports targeted upstream EngineHub/WorldGuard fixes into the Folia 1.21.11 branch while keeping the older 1.21.11 API baseline:

The full upstream branch is intentionally not merged here: it contains a broad 7.0.21/26.1+ build and API migration that is not suitable for a blind Folia 1.21.11 sync. The separate full-sync PR remains draft for manual review. Existing Folia scheduler/region patches and player/world/config data remain unchanged.

CI evidence for exact head

Safety gates

Keep this PR draft until the build/test matrix passes and genuine Folia 1.21.11 runtime smoke evidence exists for this exact SHA (cross-region block causes, session initialization, and bypass-cache access). Build-only checks do not qualify. No merge, release, or production deployment.

@Namnarak Namnarak changed the title fix(folia): port upstream #2321 cross-region block access guard fix(folia): port upstream #2321 and #2325 session safety fixes Nov 5, 2026

Namnarak commented Nov 6, 2026

Copy link
Copy Markdown
Author

Upstream follow-up — WorldGuard EngineHub#2330 (2026-11-05)

Ported the targeted session-cache change from EngineHub/WorldGuard@494f500e21c3 into this PR.

  • Replaced the sessions.asMap().computeIfAbsent(...) call with getIfPresent / put while retaining this Folia fork's weak-reference CacheKey.
  • Left the existing bypassCache.getUnchecked path unchanged because the Folia branch already uses that API.
  • No scheduler, region ownership, configuration, world data, or player data changes.

New exact head: 95e1b54b828dd058ea20af6983c4aa2ba92959e9.
The Folia 1.21.11 Development Build is running: Actions #42142490532.

Draft only; do not merge or release until the complete CI matrix and an exact-head Folia 1.21.11 runtime test are recorded.

Namnarak commented Nov 6, 2026

Copy link
Copy Markdown
Author

CI result — exact head verified

The Folia 1.21.11 Development Build completed successfully for 95e1b54b828dd058ea20af6983c4aa2ba92959e9:
Actions run #42142490532.

This is build/test evidence only. The PR remains Draft; the exact-head disposable Folia 1.21.11 runtime smoke and the broader required test matrix are still outstanding. No release or deployment is authorized.

@Namnarak Namnarak changed the title fix(folia): port upstream #2321 and #2325 session safety fixes fix(folia): port WorldGuard #2321, #2325 and #2330 for 1.21.11 Nov 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant