AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 19:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #2858 (#2882)

Browse Source
This commit is contained in:
Adrian Siekierka 2018-07-04 20:51:46 +02:00 committed by Vexatos
parent ac67d8ba37
commit 088964b168
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/container/Player.scala
View File

@ -66,13 +66,13 @@ abstract class Player(val playerInventory: InventoryPlayer, val otherInventory:
// for ghost slots we don't care about stack size
val fromStack = from.getStack
val toStack = if (to.getHasStack) to.getStack else null
val toStack = if (to.getHasStack) to.getStack else ItemStack.EMPTY
val toStackSize = if (!toStack.isEmpty) toStack.getCount else 0
val maxStackSize = math.min(fromStack.getMaxStackSize, to.getSlotStackLimit)
val itemsMoved = math.min(maxStackSize - toStackSize, fromStack.getCount)
if (toStack != null) {
if (!toStack.isEmpty) {
if (toStackSize < maxStackSize &&
fromStack.isItemEqual(toStack) &&
ItemStack.areItemStackTagsEqual(fromStack, toStack) &&