Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10

This commit is contained in:
Florian Nücke 2015-05-26 15:24:44 +02:00
commit 9c7d4a9815

View File

@ -112,7 +112,7 @@ private[oc] object Registry extends api.detail.DriverAPI {
memo.get(valueRef) memo.get(valueRef)
} }
else valueRef match { else valueRef match {
case null | None => null case null | Unit | None => null
case arg: java.lang.Boolean => arg case arg: java.lang.Boolean => arg
case arg: java.lang.Byte => arg case arg: java.lang.Byte => arg