Patch for latest spigot, may have issues, for #1635cross-compat is getting messy as Spigot is changing too many nameswithin a single version label (commit: eea6e83)