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

fix merge compiler errors

Browse Source
This commit is contained in:
payonel 2018-02-21 19:50:15 -08:00
parent a38a920903
commit a1cd9349e8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/common/block/Cable.scala
View File

@ -60,8 +60,8 @@ class Cable(protected implicit val tileTag: ClassTag[tileentity.Cable]) extends
override def getBoundingBox(state: IBlockState, world: IBlockAccess, pos: BlockPos): AxisAlignedBB = Cable.bounds(world, pos) override def getBoundingBox(state: IBlockState, world: IBlockAccess, pos: BlockPos): AxisAlignedBB = Cable.bounds(world, pos)
override def addCollisionBoxToList(state : IBlockState, world : World, pos : BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB], entity : Entity) = { override def addCollisionBoxToList(state: IBlockState, worldIn: World, pos: BlockPos, entityBox: AxisAlignedBB, collidingBoxes: util.List[AxisAlignedBB], entityIn: Entity, isActualState: Boolean): Unit = {
Cable.parts(world, pos, entityBox, boxes) Cable.parts(worldIn, pos, entityBox, collidingBoxes)
} }
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
@ -144,13 +144,13 @@ object Cable {
def parts(world: IBlockAccess, pos: BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB]) = { def parts(world: IBlockAccess, pos: BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB]) = {
val center = Cable.DefaultBounds.offset(pos) val center = Cable.DefaultBounds.offset(pos)
if (entityBox.intersectsWith(center)) boxes.add(center) if (entityBox.intersects(center)) boxes.add(center)
val mask = Cable.neighbors(world, pos) val mask = Cable.neighbors(world, pos)
for (side <- EnumFacing.VALUES) { for (side <- EnumFacing.VALUES) {
if(((1 << side.getIndex) & mask) != 0) { if(((1 << side.getIndex) & mask) != 0) {
val part = Cable.CachedParts(side.ordinal()).offset(pos) val part = Cable.CachedParts(side.ordinal()).offset(pos)
if (entityBox.intersectsWith(part)) boxes.add(part) if (entityBox.intersects(part)) boxes.add(part)
} }
} }
} }

2
src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
View File

@ -52,7 +52,7 @@ class UpgradeCrafting(val host: EnvironmentHost with internal.Robot) extends Abs
copyItemsFromHost() copyItemsFromHost()
var countCrafted = 0 var countCrafted = 0
val initialCraft = CraftingManager.findMatchingRecipe(CraftingInventory, host.world) val initialCraft = CraftingManager.findMatchingRecipe(CraftingInventory, host.world)
if (initialCraft != null && !initialCraft.isEmpty) { if (initialCraft != null) {
def tryCraft() : Boolean = { def tryCraft() : Boolean = {
val craft = CraftingManager.findMatchingRecipe(CraftingInventory, host.world) val craft = CraftingManager.findMatchingRecipe(CraftingInventory, host.world)
if (craft == null || craft != initialCraft) { if (craft == null || craft != initialCraft) {