Merge remote-tracking branch 'origin/feature/packetmine-rewrite' into feature/packetmine-rewrite

beanbag44 · beanbag44 · commit fbe2756c485a · 2025-04-05T20:05:55.000+01:00
diff --git a/common/src/main/kotlin/com/lambda/interaction/material/container/containers/MainHandContainer.kt b/common/src/main/kotlin/com/lambda/interaction/material/container/containers/MainHandContainer.kt
@@ -63,7 +63,8 @@ object MainHandContainer : MaterialContainer(Rank.MAIN_HAND) {
 
                 when (moveStack) {
                     in player.hotbar -> swapToHotbarSlot(player.hotbar.indexOf(moveStack))
-                    in player.storage -> pickFromInventory(player.combined.indexOf(moveStack))
+                    // ToDo: Use pickFromInventory
+                    in player.storage -> swap(player.combined.indexOf(moveStack), 0)
                 }
 
                 if (hand == Hand.OFF_HAND) swapHands()

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ object MainHandContainer : MaterialContainer(Rank.MAIN_HAND) {`
`63`	`63`
`64`	`64`	`when (moveStack) {`
`65`	`65`	`in player.hotbar -> swapToHotbarSlot(player.hotbar.indexOf(moveStack))`
`66`		`- in player.storage -> pickFromInventory(player.combined.indexOf(moveStack))`
	`66`	`+ // ToDo: Use pickFromInventory`
	`67`	`+ in player.storage -> swap(player.combined.indexOf(moveStack), 0)`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`if (hand == Hand.OFF_HAND) swapHands()`