Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed quick move to potentially move into illegal slot.

Browse Source
This commit is contained in:
Florian Nücke
2022-01-13 10:46:12 +01:00
parent c97bf66bc4
commit cfe2bbb618
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/li/cil/oc2/common/container/AbstractContainer.java
View File

@@ -50,11 +50,15 @@ public abstract class AbstractContainer extends AbstractContainerMenu {
continue;
}
final ItemStack intoStack = into.getItem();
if (intoStack.isEmpty()) {
if (!into.mayPlace(fromStack)) {
continue;
}
if (!into.hasItem()) {
continue;
}
final ItemStack intoStack = into.getItem();
final boolean itemsAreEqual = fromStack.sameItem(intoStack) && ItemStack.tagMatches(fromStack, intoStack);
if (!itemsAreEqual) {
continue;
@@ -90,11 +94,11 @@ public abstract class AbstractContainer extends AbstractContainerMenu {
continue;
}
if (into.hasItem()) {
if (!into.mayPlace(fromStack)) {
continue;
}
if (!into.mayPlace(fromStack)) {
if (into.hasItem()) {
continue;
}