Modernize instanceof checks, switch expressions, and error handling - #3635
Open
MattBDev wants to merge 3 commits into
Open
Modernize instanceof checks, switch expressions, and error handling#3635MattBDev wants to merge 3 commits into
MattBDev wants to merge 3 commits into
Conversation
MattBDev
commented
Aug 25, 2026
| return switch (actor) { | ||
| case com.sk89q.worldedit.entity.Player player -> adapt(player); | ||
| case BukkitBlockCommandSender bukkitBlockCommandSender -> bukkitBlockCommandSender.getSender(); | ||
| case null, default -> ((BukkitCommandSender) actor).getSender(); |
Contributor
Author
There was a problem hiding this comment.
I think this may result in an NPE. I just want a second opinion on this before I go and fix it before the PR is approved and merged.
Member
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Consolidate
instanceofchecks to pattern-variable form and convert legacyswitchstatements to arrow-form switch expressions across the codebase (NBT streams, block/direction/entity registries, expression compiler, YAML, math utils, etc.)Improve error message formatting and use try-with-resources for
CloserinBukkitImplLoaderErrorprone library was added to
libs.versions.tomlfor future work when catching up to upstream. Included it just in case we choose to adopt it too.