From 673f3d9a8ff86c6f388a19edc4a13dc5d436a92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 26 Apr 2015 18:03:39 +0200 Subject: [PATCH] Fixed potential NPE in rotatable class... probably. Dem race conditions. --- .../scala/li/cil/oc/common/tileentity/traits/Rotatable.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala index 5d2ba7034..093202166 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala @@ -148,13 +148,13 @@ trait Rotatable extends RotationAware with internal.Rotatable { else false } - override def toLocal(value: EnumFacing) = if (value != null) { + override def toLocal(value: EnumFacing) = if (value != null) this.synchronized { updateTranslation() cachedTranslation(value.ordinal) } else null - override def toGlobal(value: EnumFacing) = if (value != null) { + override def toGlobal(value: EnumFacing) = if (value != null) this.synchronized { updateTranslation() cachedInverseTranslation(value.ordinal) }