Skip to content

Fix three minor ShelfBlock issues #14148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
okcoder123 wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −0
Open

Fix three minor ShelfBlock issues #14148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions paper-server/patches/sources/net/minecraft/world/level/block/ShelfBlock.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,26 @@
BlockState newState = state.setValue(POWERED, signal);
if (!signal) {
newState = newState.setValue(SIDE_CHAIN_PART, SideChainPart.UNCONNECTED);
@@ -162,7 +_,7 @@
final InteractionHand hand,
final BlockHitResult hitResult
) {
- if (level.getBlockEntity(pos) instanceof ShelfBlockEntity shelfBlockEntity && !hand.equals(InteractionHand.OFF_HAND)) {
+ if (level.getBlockEntity(pos) instanceof ShelfBlockEntity shelfBlockEntity) {
OptionalInt hitSlot = this.getHitSlot(hitResult, state.getValue(FACING));
if (hitSlot.isEmpty()) {
return InteractionResult.PASS;
@@ -227,11 +_,10 @@
boolean anySwapped = false;

for (int shelfPartIndex = 0; shelfPartIndex < connectedBlocks.size(); shelfPartIndex++) {
- ShelfBlockEntity shelfPart = (ShelfBlockEntity)level.getBlockEntity(connectedBlocks.get(shelfPartIndex));
- if (shelfPart != null) {
+ if (level.getBlockEntity(connectedBlocks.get(shelfPartIndex)) instanceof ShelfBlockEntity shelfPart) {
for (int slot = 0; slot < shelfPart.getContainerSize(); slot++) {
int inventorySlot = 9 - (connectedBlocks.size() - shelfPartIndex) * shelfPart.getContainerSize() + slot;
- if (inventorySlot >= 0 && inventorySlot <= inventory.getContainerSize()) {
+ if (inventorySlot >= 0 && inventorySlot < inventory.getContainerSize()) {
ItemStack placedInventoryItem = inventory.removeItemNoUpdate(inventorySlot);
ItemStack removedShelfItem = shelfPart.swapItemNoUpdate(slot, placedInventoryItem);
if (!placedInventoryItem.isEmpty() || !removedShelfItem.isEmpty()) {