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

extra validation for pitch and yaw of rotatable blocks

Browse Source
This commit is contained in:
Florian Nücke 2014-01-21 19:07:22 +01:00
parent 568bd7b873
commit 53e96153f0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
li/cil/oc/common/tileentity/Rotatable.scala
View File

@ -165,9 +165,8 @@ trait Rotatable extends RotationAware with Persistable {
override def load(nbt: NBTTagCompound) = { override def load(nbt: NBTTagCompound) = {
super.load(nbt) super.load(nbt)
_pitch = ForgeDirection.getOrientation(nbt.getInteger(Settings.namespace + "pitch")) _pitch = ForgeDirection.getOrientation(nbt.getInteger(Settings.namespace + "pitch"))
if (_pitch == ForgeDirection.UNKNOWN) _pitch = ForgeDirection.NORTH
_yaw = ForgeDirection.getOrientation(nbt.getInteger(Settings.namespace + "yaw")) _yaw = ForgeDirection.getOrientation(nbt.getInteger(Settings.namespace + "yaw"))
if (_yaw == ForgeDirection.UNKNOWN) _yaw = ForgeDirection.SOUTH validatePitchAndYaw()
updateTranslation() updateTranslation()
} }
@ -182,6 +181,7 @@ trait Rotatable extends RotationAware with Persistable {
super.readFromNBTForClient(nbt) super.readFromNBTForClient(nbt)
_pitch = ForgeDirection.getOrientation(nbt.getInteger("pitch")) _pitch = ForgeDirection.getOrientation(nbt.getInteger("pitch"))
_yaw = ForgeDirection.getOrientation(nbt.getInteger("yaw")) _yaw = ForgeDirection.getOrientation(nbt.getInteger("yaw"))
validatePitchAndYaw()
updateTranslation() updateTranslation()
} }
@ -191,6 +191,15 @@ trait Rotatable extends RotationAware with Persistable {
nbt.setInteger("yaw", _yaw.ordinal) nbt.setInteger("yaw", _yaw.ordinal)
} }
private def validatePitchAndYaw() {
if (!Set(ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH).contains(_pitch)) {
_pitch = ForgeDirection.NORTH
}
if (!Set(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST).contains(_yaw)) {
_yaw = ForgeDirection.SOUTH
}
}
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
/** Updates cached translation array and sends notification to clients. */ /** Updates cached translation array and sends notification to clients. */