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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-03-07 13:27:44 +01:00
commit f2435a4413
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/server/network/Connector.scala
View File

@ -64,6 +64,10 @@ trait Connector extends network.Connector with Node {
else {
this.synchronized(distributor match {
case Some(d) => d.synchronized {
if (localBuffer > localBufferSize) {
d.changeBuffer(localBuffer - localBufferSize)
localBuffer = localBufferSize
}
val newGlobalBuffer = globalBuffer + delta
newGlobalBuffer >= 0 && newGlobalBuffer <= globalBufferSize && d.changeBuffer(delta) == 0
}
@ -86,7 +90,7 @@ trait Connector extends network.Connector with Node {
if (network != null) {
if (localBufferSize <= 0 && size > 0) d.addConnector(this)
else if (localBufferSize > 0 && size == 0) d.removeConnector(this)
d.globalBufferSize = math.max(d.globalBufferSize - localBufferSize + size, 0)
else d.globalBufferSize = math.max(d.globalBufferSize - localBufferSize + size, 0)
}
localBufferSize = math.max(size, 0)
val surplus = math.max(localBuffer - localBufferSize, 0)