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

Fixed items that only differ in their NBT tag potentially being merged when picked up by a robot. Closes #449.

Browse Source
This commit is contained in:
Florian Nücke 2014-07-30 17:09:28 +02:00
parent 395533ef14
commit 28fc8b175b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/server/component/robot/Inventory.scala
View File

@ -88,7 +88,7 @@ class Inventory(val robot: tileentity.Robot) extends InventoryPlayer(null) {
else inventorySlots.find(slot => { else inventorySlots.find(slot => {
val existing = getStackInSlot(slot) val existing = getStackInSlot(slot)
existing != null && existing.isItemEqual(stack) && existing != null && existing.isItemEqual(stack) &&
(!existing.getHasSubtypes || existing.getItemDamage == stack.getItemDamage) && (!existing.getHasSubtypes || (existing.getItemDamage == stack.getItemDamage && ItemStack.areItemStackTagsEqual(existing, stack))) &&
(existing.stackSize < math.min(existing.getMaxStackSize, getInventoryStackLimit)) (existing.stackSize < math.min(existing.getMaxStackSize, getInventoryStackLimit))
}).getOrElse(getFirstEmptyStackAccepting(stack)) }).getOrElse(getFirstEmptyStackAccepting(stack))
if (slot >= firstInventorySlot) { if (slot >= firstInventorySlot) {