AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-10 07:45:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

better handle buggy IItemHandlers

Browse Source
This commit is contained in:
Adrian Siekierka 2022-06-08 20:20:32 +02:00
parent 318d82092c
commit eb2619b6de
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/li/cil/oc/util/InventoryUtils.scala
View File

@ -133,7 +133,7 @@ object InventoryUtils {
val stack = inventory.getStackInSlot(slot) val stack = inventory.getStackInSlot(slot)
if (stack.isEmpty || limit <= 0 || stack.getCount <= 0) if (stack.isEmpty || limit <= 0 || stack.getCount <= 0)
return 0 return 0
var amount = stack.getMaxStackSize min stack.getCount min limit var amount = stack.getMaxStackSize min stack.getCount min limit
inventory.extractItem(slot, amount, true) match { inventory.extractItem(slot, amount, true) match {
case simExtracted: ItemStack => case simExtracted: ItemStack =>
val extracted = simExtracted.copy val extracted = simExtracted.copy
@ -142,9 +142,13 @@ object InventoryUtils {
val count = (amount - extracted.getCount) max 0 val count = (amount - extracted.getCount) max 0
if (count > 0) inventory.extractItem(slot, count, false) match { if (count > 0) inventory.extractItem(slot, count, false) match {
case realExtracted: ItemStack if realExtracted.getCount == count => consumer(realExtracted, false) case realExtracted: ItemStack if realExtracted.getCount == count => consumer(realExtracted, false)
case _ => case realExtracted =>
OpenComputers.log.warn("An IItemHandler instance acted differently between simulated and non-simulated extraction. Offender: " + inventory) OpenComputers.log.warn("An IItemHandler instance acted differently between simulated and non-simulated extraction. Offender: " + inventory)
} // Attempt inserting the stack anyway, to minimize world-side item loss.
if (realExtracted != null && !realExtracted.isEmpty) {
consumer(realExtracted, false)
}
}
count count
case _ => 0 case _ => 0
} }