From cfe2bbb618fd0d9db88400a8f7c91c7863b130d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Thu, 13 Jan 2022 10:46:12 +0100
Subject: [PATCH] Fixed quick move to potentially move into illegal slot.

---
 .../cil/oc2/common/container/AbstractContainer.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/container/AbstractContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractContainer.java
index 6ca74672..e8a71431 100644
--- a/src/main/java/li/cil/oc2/common/container/AbstractContainer.java
+++ b/src/main/java/li/cil/oc2/common/container/AbstractContainer.java
@@ -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;
             }