Skip to content
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

Fix MenuType builder locations clashing with existing blocks. #12055

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+1 −0
Open

Fix MenuType builder locations clashing with existing blocks. #12055

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33384b
Switch BlockPos to zero instead of player to prevent clashing
Y2Kwastaken Feb 2, 2025
f083987
Fix clashing of InventoryView locations with real world
Y2Kwastaken Feb 2, 2025
2d769a1
cleanup
Y2Kwastaken Feb 2, 2025
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
3 changes: 2 additions & 1 deletion ...rg/bukkit/craftbukkit/inventory/view/builder/CraftAccessLocationInventoryViewBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.inventory.view.builder;

import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.inventory.AbstractContainerMenu;
Expand All @@ -21,7 +22,7 @@ public CraftAccessLocationInventoryViewBuilder(final MenuType<?> handle, final C
protected AbstractContainerMenu buildContainer(final ServerPlayer player) {
final ContainerLevelAccess access;
if (super.position == null) {
access = ContainerLevelAccess.create(player.level(), player.blockPosition());
access = ContainerLevelAccess.create(player.level(), BlockPos.ZERO);
} else {
access = ContainerLevelAccess.create(super.world, super.position);
}
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/bukkit/craftbukkit/inventory/view/builder/CraftBlockEntityInventoryViewBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected AbstractContainerMenu buildContainer(final ServerPlayer player) {
}

if (this.position == null) {
this.position = player.blockPosition();
this.position = BlockPos.ZERO;
Y2Kwastaken marked this conversation as resolved.
Show resolved Hide resolved
}

final BlockEntity entity = this.world.getBlockEntity(position);
Expand Down
Loading