Repository navigation
fix(Quiver): read potion contents from ItemStack and fix inventory scan and head check - #6714
Merged
MineGame159 merged 2 commits intoOct 17, 2026
Merged
Conversation
…ws, and skip redundant slot 9 move
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.
Type of change
Description
DataComponents.POTION_CONTENTSfrom theItemStack(item.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY)) instead ofitem.getItem().components(), which reads the baseItems.TIPPED_ARROWdefault components (PotionContents.EMPTY) and never matches any tipped arrows.SlotUtils.OFFHANDdown toSlotUtils.HOTBAR_STARTwhile skipping armor slots (SlotUtils.isArmor(i)), instead of starting atmc.player.getInventory().getContainerSize()(which included armor slots and out-of-bounds index 41 and skipped slot 0), and skip moving slot 9 to slot 9 when the arrow is already in slot 9.testPos.setWithOffset(...)/testPos.move(0, 1, 0)instead of discarding the return value of immutableBlockPos.offset(...)andBlockPos.relative(...)calls onMutableBlockPosinheadIsOpen()andisSurrounded().wasMainhand,wasHotbar, andprevSlotbeforeshouldQuiver()can early-deactivate the module, and releasekeyUseinonDeactivate().Related issues
Closes #6343
How Has This Been Tested?
Compiled with
./gradlew compileJavaand verified slot bounds,DataComponents.POTION_CONTENTSlookup, andMutableBlockPosmutations inheadIsOpen()andisSurrounded().Checklist: