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

Fixed check for whether used item has been 'used up' in robots for cases where the stack is replaced by the interact function. Fixes #583.

Browse Source
This commit is contained in:
Florian Nücke 2014-10-01 18:36:14 +02:00
parent 2d9cdfac72
commit 860130cff2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/server/component/robot/Player.scala
View File

@ -128,13 +128,11 @@ class Player(val robot: tileentity.Robot) extends FakePlayer(robot.world.asInsta
false false
} }
!cancel && callUsingItemInSlot(0, stack => { !cancel && callUsingItemInSlot(0, stack => {
val current = getCurrentEquippedItem
val result = isItemUseAllowed(stack) && (entity.interactFirst(this) || (entity match { val result = isItemUseAllowed(stack) && (entity.interactFirst(this) || (entity match {
case living: EntityLivingBase if current != null => current.func_111282_a(this, living) case living: EntityLivingBase if getCurrentEquippedItem != null => getCurrentEquippedItem.func_111282_a(this, living)
case _ => false case _ => false
})) }))
if (current != null && current.stackSize <= 0) { if (getCurrentEquippedItem != null && getCurrentEquippedItem.stackSize <= 0) {
destroyCurrentEquippedItem() destroyCurrentEquippedItem()
} }
result result