Skip to content

fix: Spigot 26.2 support - #3636

Open
PierreSchwang wants to merge 6 commits into
mainfrom
fix/spigot
Open

fix: Spigot 26.2 support#3636
PierreSchwang wants to merge 6 commits into
mainfrom
fix/spigot

Conversation

@PierreSchwang

Copy link
Copy Markdown
Member

Overview

Fixes #3623

Description

Include adapters for MC 26+ in Bukkit JAR and fix some issues for 26.2 which prevent FAWE from working (26.1 was not fixed)

Submitter Checklist

  • Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
  • Ensure that the pull request title represents the desired changelog entry.
  • New public fields and methods are annotated with @since TODO.
  • I read and followed the contribution guidelines.

declarative specification for which adapters need to be reobfuscated, directly on the affected adapters. Should also fix some issues with running paperweight on modern toolchains.
Starting with MC 26(.1), Spigot uses Mojang mappings for the server JAR. The configuration of the bukkit module did not include the unobfuscated adapters for the newer versions due to not differentiating between reobfuscation requirements between platforms.
- Refraction is not required anymore.
- Conversion between NMS and CB BlockStates requires reflection / MH invocations on Spigot (Paper method does not exist on Spigot, and Spigot method is not available in Paper and can't be called directly therefor)
@PierreSchwang
PierreSchwang requested a review from a team as a code owner August 28, 2026 13:42
@PierreSchwang

Copy link
Copy Markdown
Member Author

Initial tests on Spigot 26.2 were fine so far. I had one issue where after the operation finished, no block changes were visually flushed to the world. After a rejoin the operation was visible. Even after restarts I could not reproduce that.

Also, some gradle configurations were adjusted to further match upstream - but not fully given we don't use crankcase. We should evaluate if we want to use parts of crankcase (not all crankcase plugins can be used)

@PierreSchwang PierreSchwang changed the title Fix/spigot fix: Spigot 26.2 support Aug 28, 2026
@MattBDev

Copy link
Copy Markdown
Contributor

I'm not opposed to crankcase, but we need to evaluate whether or not it meets our needs and if we would have to make any changes for our build process. Otherwise, I approve.

@Timongcraft

Copy link
Copy Markdown
Contributor

Currently the new impl for the fake block handling (#3367) depends on a paper-specific code, I'm currently upstreaming a spigot-compatible version, so I wanted to ask if I should open a PR now to merge into this PR or wait until upstream accepts the changes and then downstream with a new PR (which was my original plan anyway since I wanted to propose a change that upstream requested)?

@PierreSchwang

Copy link
Copy Markdown
Member Author

Currently the new impl for the fake block handling (#3367) depends on a paper-specific code, I'm currently upstreaming a spigot-compatible version, so I wanted to ask if I should open a PR now to merge into this PR or wait until upstream accepts the changes and then downstream with a new PR (which was my original plan anyway since I wanted to propose a change that upstream requested)?

I don't think that's mission critical - I'm fine with either. You can also target main when this is merged.

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.

Spigot build does not run

4 participants