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

Merge branch 'master-MC1.11' into master-MC1.12

Browse Source
This commit is contained in:
payonel 2018-03-20 14:17:56 -07:00
commit ac67d8ba37
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/GuiHandler.scala
View File

@ -87,7 +87,7 @@ abstract class GuiHandler extends IGuiHandler {
case Some(tablet: item.Tablet) if id == GuiType.Tablet.id => mainItem case Some(tablet: item.Tablet) if id == GuiType.Tablet.id => mainItem
case Some(tablet: item.Tablet) if id == GuiType.TabletInner.id => mainItem case Some(tablet: item.Tablet) if id == GuiType.TabletInner.id => mainItem
case Some(terminal: item.Terminal) if id == GuiType.Terminal.id => mainItem case Some(terminal: item.Terminal) if id == GuiType.Terminal.id => mainItem
case _ => player.inventory.offHandInventory(0) case _ => player.inventory.offHandInventory.get(0)
} }
} }
} }

2
src/main/scala/li/cil/oc/common/block/DiskDrive.scala
View File

@ -68,7 +68,7 @@ class DiskDrive extends SimpleBlock with traits.GUI {
if (hand == EnumHand.MAIN_HAND) if (hand == EnumHand.MAIN_HAND)
player.inventory.decrStackSize(player.inventory.currentItem, 1) player.inventory.decrStackSize(player.inventory.currentItem, 1)
else else
player.inventory.offHandInventory(0).stackSize -= 1 player.inventory.offHandInventory.get(0).shrink(1)
} }
isDiskInDrive || isHoldingDisk isDiskInDrive || isHoldingDisk
case _ => false case _ => false