refactor: simplify hitbox damage trigger checks#282
Merged
toxicity188 merged 1 commit intov2-devfrom Feb 17, 2026
Merged
Conversation
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.
Motivation
triggered()already encapsulates the cancellation state for hitbox damage events to make the damage gate simpler and less error-prone.Description
if (!event.call().triggered() || event.cancelled)withif (!event.call().triggered())across NMS and Fabric hitbox damage paths to centralize cancellation semantics.nms/v1_21_R1/.../HitBoxImpl.kt,nms/v1_21_R3/.../HitBoxImpl.kt,nms/v1_21_R4/.../HitBoxImpl.kt,nms/v1_21_R5/.../HitBoxImpl.kt,nms/v1_21_R6/.../HitBoxImpl.kt,nms/v1_21_R7/.../HitBoxImpl.kt, andplatform/fabric/.../HitBoxEntityImpl.kt.ModelDamagedEvent.call().triggered()semantics.5429d46d.Testing
rgto verify there are no remainingevent.cancelledchecks in the affected hitbox damage paths and confirmed all replaced occurrences now useif (!event.call().triggered()); this check succeeded.listener.damage(event)is invoked before thetriggered()check; no automated compile or unit tests were run in this change.Codex Task