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

Fixed pseudo-racing condition in package relay of switches and co. that could increase the time it took to resend a packet. Closes #327.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-16 21:51:25 +02:00
parent 8f1cac9f9a
commit 7d62262984
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
View File

@ -39,14 +39,19 @@ trait Hub extends traits.Environment with SidedEnvironment {
else if (queue.nonEmpty) queue.synchronized {
val (sourceSide, packet) = queue.dequeue()
relayPacket(sourceSide, packet)
relayCooldown = relayDelay
if (queue.nonEmpty) {
relayCooldown = relayDelay
}
else {
relayCooldown = -1
}
}
}
protected def tryEnqueuePacket(sourceSide: ForgeDirection, packet: Packet) = queue.synchronized {
if (packet.ttl > 0 && queue.size < maxQueueSize) {
queue += sourceSide -> packet.hop()
if (relayCooldown <= 0) {
if (relayCooldown < 0) {
relayCooldown = relayDelay
}
true