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

Merge branch 'master-MC1.7.10' into master-MC1.10

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
This commit is contained in:
payonel 2018-11-04 12:27:08 -08:00
commit 8e31e73b09
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
View File

@ -62,8 +62,13 @@ class Adapter extends traits.Environment with traits.ComponentInventory with tra
// ----------------------------------------------------------------------- //
override def onAnalyze(player: EntityPlayer, side: EnumFacing, hitX: Float, hitY: Float, hitZ: Float) = blocks collect {
case Some(((environment, _))) => environment.node
override def onAnalyze(player: EntityPlayer, side: EnumFacing, hitX: Float, hitY: Float, hitZ: Float): Array[Node] = {
(blocks collect {
case Some((environment, _)) => environment.node
}) ++
(components collect {
case Some(environment) => environment.node
})
}
// ----------------------------------------------------------------------- //