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

Merge branch master-MC1.10 into master-MC1.11

Browse Source
This commit is contained in:
payonel 2017-12-10 03:53:14 -08:00
commit c0eefc152e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/li/cil/oc/server/component/MotionSensor.scala
View File

@ -102,18 +102,15 @@ class MotionSensor(val host: EnvironmentHost) extends prefab.AbstractManagedEnvi
// is pseudo-infrared driven (it only works for *living* entities, after // is pseudo-infrared driven (it only works for *living* entities, after
// all), so I think it makes more sense for it to work in the dark, too. // all), so I think it makes more sense for it to work in the dark, too.
/* entity.getBrightness(0) > 0.2 && */ { /* entity.getBrightness(0) > 0.2 && */ {
var ox = x + 0.5 var origin = new Vec3d(x, y, z)
var oy = y + 0.5
var oz = z + 0.5
val target = new Vec3d(entity.posX, entity.posY, entity.posZ) val target = new Vec3d(entity.posX, entity.posY, entity.posZ)
// Start trace outside of this block. val path = origin.subtract(target).normalize()
if (entity.posX < x) ox -= 0.75 origin = origin.addVector(
if (entity.posX > x + 1) ox += 0.75 path.xCoord * 0.75,
if (entity.posY < y) oy -= 0.75 path.yCoord * 0.75,
if (entity.posY > y + 1) oy += 0.75 path.zCoord * 0.75
if (entity.posZ < z) oz -= 0.75 )
if (entity.posZ > z + 1) oz += 0.75 world.rayTraceBlocks(origin, target) == null
world.rayTraceBlocks(new Vec3d(ox, oy, oz), target) == null
} }
private def sendSignal(entity: EntityLivingBase) { private def sendSignal(entity: EntityLivingBase) {