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

Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
This commit is contained in:
Florian Nücke 2015-02-20 01:34:02 +01:00
commit 957c5e7f82

View File

@ -51,11 +51,13 @@ trait Computer extends Environment with ComponentInventory with Rotatable with B
def setRunning(value: Boolean): Unit = if (value != _isRunning) {
_isRunning = value
world.markBlockForUpdate(getPos)
runSound.foreach(sound =>
if (_isRunning) Sound.startLoop(this, sound, 0.5f, 50 + world.rand.nextInt(50))
else Sound.stopLoop(this)
)
if (world != null) {
world.markBlockForUpdate(getPos)
runSound.foreach(sound =>
if (_isRunning) Sound.startLoop(this, sound, 0.5f, 50 + world.rand.nextInt(50))
else Sound.stopLoop(this)
)
}
}
@SideOnly(Side.CLIENT)