Merge pull request #1172 from P3pp3rF1y/1.20.x-dev

fix: 🐛 Fixed stashing logic to be able to stash oversized stacks (lar…
P3pp3rF1y · Oct 6, 2024 · ccb3ec7 · ccb3ec7
2 parents 911c6b2 + 1dfd791
commit ccb3ec7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedbackpacks
 mod_group_id=sophisticatedbackpacks
-mod_version=3.20.10
+mod_version=3.20.11
 sonar_project_key=sophisticatedbackpacks:SophisticatedBackpacks
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedBackpacks
 

diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/backpack/BackpackItem.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/backpack/BackpackItem.java
@@ -420,8 +420,14 @@ public boolean overrideStackedOnOther(ItemStack storageStack, Slot slot, ClickAc
 		ItemStack stashResult = stash(storageStack, stackToStash, true);
 		if (stashResult.getCount() < stackToStash.getCount()) {
 			int countToTake = stackToStash.getCount() - stashResult.getCount();
-			ItemStack takeResult = slot.safeTake(countToTake, countToTake, player);
-			stash(storageStack, takeResult, false);
+			while (countToTake > 0) {
+				ItemStack takeResult = slot.safeTake(countToTake, countToTake, player);
+				if (takeResult.isEmpty()) {
+					break;
+				}
+				stash(storageStack, takeResult, false);
+				countToTake -= takeResult.getCount();
+			}
 			return true;
 		}