Merge branch 'kotlin-1.8' into kotlin-1.9

This commit is contained in:
octarine-noise
2016-05-16 12:16:48 +02:00
4 changed files with 7 additions and 1 deletions

View File

@@ -110,6 +110,9 @@ val IModel.modelBlockAndLoc: Pair<ModelBlock, ResourceLocation>? get() {
it.modelBlockAndLoc.let { if (it != null) return it }
}
}
else if (Refs.MultiModel.isInstance(this)) Refs.base_MM.get(this)?.let {
return (it as IModel).modelBlockAndLoc
}
return null
}