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

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

Browse Source 
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
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
View File

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