Validate beacon effect selections#13833
Open
NoahvdAa wants to merge 1 commit intoPaperMC:mainfrom
Open
Conversation
Beacons don't do any validation on the selected effects except for checking whether the effects are in the whitelist. This commit adds validation to check if a secondary-only effect (regeneration) is used as a primary and whether the effect is allowed to be selected according to the beacon's level. Closes PaperMC#13631.
kennytv
approved these changes
Apr 29, 2026
| - public void updateEffects(final Optional<Holder<MobEffect>> primary, final Optional<Holder<MobEffect>> secondary) { | ||
| + public void updateEffects(final Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) { // Paper - fix MC-174630 - make non-final | ||
| + public void updateEffects(Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) { // Paper - fix MC-174630 - make non-final | ||
| + // Paper start - fix MC-174630 - validate secondary power |
Contributor
There was a problem hiding this comment.
Should update the comment now, and move the MC fixes comment to the relevant if statement
| + if (secondary.isPresent() && secondary.get() != net.minecraft.world.effect.MobEffects.REGENERATION && (primary.isPresent() && secondary.get() != primary.get())) { | ||
| + secondary = Optional.empty(); | ||
| + } | ||
| + if (!(this.access.getWorld().getBlockEntity(this.access.getPosition()) instanceof net.minecraft.world.level.block.entity.BeaconBlockEntity beaconEntity)) { |
Contributor
There was a problem hiding this comment.
Better to do this first to early return.
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
3 participants
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.
Beacons don't do any validation on the selected effects except for checking whether the effects are in the whitelist. This commit adds validation to check if a secondary-only effect (regeneration) is used as a primary and whether the effect is allowed to be selected according to the beacon's level.
Closes #13631.