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

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

Browse Source
This commit is contained in:
Florian Nücke 2014-07-29 14:25:16 +02:00
commit 080b400901
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/server/component/robot/Player.scala
View File

@ -67,6 +67,8 @@ class Player(val robot: tileentity.Robot) extends FakePlayer(robot.world.asInsta
override def getDisplayName = robot.name override def getDisplayName = robot.name
theItemInWorldManager.setBlockReachDistance(1)
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
def updatePositionAndRotation(facing: ForgeDirection, side: ForgeDirection) { def updatePositionAndRotation(facing: ForgeDirection, side: ForgeDirection) {
@ -74,9 +76,9 @@ class Player(val robot: tileentity.Robot) extends FakePlayer(robot.world.asInsta
this.side = side this.side = side
// Slightly offset in robot's facing to avoid glitches (e.g. Portal Gun). // Slightly offset in robot's facing to avoid glitches (e.g. Portal Gun).
val direction = Vec3.createVectorHelper( val direction = Vec3.createVectorHelper(
facing.offsetX + side.offsetX * 0.5 + robot.facing.offsetX * 0.01, facing.offsetX + side.offsetX + robot.facing.offsetX * 0.01,
facing.offsetY + side.offsetY * 0.5 + robot.facing.offsetY * 0.01, facing.offsetY + side.offsetY + robot.facing.offsetY * 0.01,
facing.offsetZ + side.offsetZ * 0.5 + robot.facing.offsetZ * 0.01).normalize() facing.offsetZ + side.offsetZ + robot.facing.offsetZ * 0.01).normalize()
val yaw = Math.toDegrees(-Math.atan2(direction.xCoord, direction.zCoord)).toFloat val yaw = Math.toDegrees(-Math.atan2(direction.xCoord, direction.zCoord)).toFloat
val pitch = Math.toDegrees(-Math.atan2(direction.yCoord, Math.sqrt((direction.xCoord * direction.xCoord) + (direction.zCoord * direction.zCoord)))).toFloat * 0.99f val pitch = Math.toDegrees(-Math.atan2(direction.yCoord, Math.sqrt((direction.xCoord * direction.xCoord) + (direction.zCoord * direction.zCoord)))).toFloat * 0.99f
setLocationAndAngles(robot.x + 0.5, robot.y, robot.z + 0.5, yaw, pitch) setLocationAndAngles(robot.x + 0.5, robot.y, robot.z + 0.5, yaw, pitch)