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

1.8.9 adjustments.

Browse Source
This commit is contained in:
Florian Nücke 2017-05-14 21:53:35 +02:00 committed by Vexatos
parent 3f41a0a7d0
commit 5f5a63203a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala
View File

@ -11,7 +11,9 @@ class MotionSensor extends traits.Environment with traits.Tickable {
override def updateEntity() { override def updateEntity() {
super.updateEntity() super.updateEntity()
motionSensor.update() if (isServer) {
motionSensor.update()
}
} }
override def readFromNBTForServer(nbt: NBTTagCompound) { override def readFromNBTForServer(nbt: NBTTagCompound) {

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

@ -91,7 +91,7 @@ class MotionSensor(val host: EnvironmentHost) extends prefab.ManagedEnvironment
} }
} }
private def sensorBounds = AxisAlignedBB.getBoundingBox( private def sensorBounds = AxisAlignedBB.fromBounds(
x + 0.5 - radius, y + 0.5 - radius, z + 0.5 - radius, x + 0.5 - radius, y + 0.5 - radius, z + 0.5 - radius,
x + 0.5 + radius, y + 0.5 + radius, z + 0.5 + radius) x + 0.5 + radius, y + 0.5 + radius, z + 0.5 + radius)
@ -103,21 +103,23 @@ class MotionSensor(val host: EnvironmentHost) extends prefab.ManagedEnvironment
// 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 && */ {
val origin = Vec3.createVectorHelper(x + 0.5, y + 0.5, z + 0.5) var ox = x + 0.5
val target = Vec3.createVectorHelper(entity.posX, entity.posY, entity.posZ) var oy = y + 0.5
var oz = z + 0.5
val target = new Vec3(entity.posX, entity.posY, entity.posZ)
// Start trace outside of this block. // Start trace outside of this block.
if (entity.posX < x) origin.xCoord -= 0.75 if (entity.posX < x) ox -= 0.75
if (entity.posX > x + 1) origin.xCoord += 0.75 if (entity.posX > x + 1) ox += 0.75
if (entity.posY < y) origin.yCoord -= 0.75 if (entity.posY < y) oy -= 0.75
if (entity.posY > y + 1) origin.yCoord += 0.75 if (entity.posY > y + 1) oy += 0.75
if (entity.posZ < z) origin.zCoord -= 0.75 if (entity.posZ < z) oz -= 0.75
if (entity.posZ > z + 1) origin.zCoord += 0.75 if (entity.posZ > z + 1) oz += 0.75
world.rayTraceBlocks(origin, target) == null world.rayTraceBlocks(new Vec3(ox, oy, oz), target) == null
} }
private def sendSignal(entity: EntityLivingBase) { private def sendSignal(entity: EntityLivingBase) {
if (Settings.get.inputUsername) { if (Settings.get.inputUsername) {
node.sendToReachable("computer.signal", "motion", Double.box(entity.posX - (x + 0.5)), Double.box(entity.posY - (y + 0.5)), Double.box(entity.posZ - (z + 0.5)), entity.getCommandSenderName) node.sendToReachable("computer.signal", "motion", Double.box(entity.posX - (x + 0.5)), Double.box(entity.posY - (y + 0.5)), Double.box(entity.posZ - (z + 0.5)), entity.getName)
} }
else { else {
node.sendToReachable("computer.signal", "motion", Double.box(entity.posX - (x + 0.5)), Double.box(entity.posY - (y + 0.5)), Double.box(entity.posZ - (z + 0.5))) node.sendToReachable("computer.signal", "motion", Double.box(entity.posX - (x + 0.5)), Double.box(entity.posY - (y + 0.5)), Double.box(entity.posZ - (z + 0.5)))