PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

master merge and light changes

Browse source
This commit is contained in:
Fate-JH 2023-07-11 05:30:55 -04:00
parent 4ab05096e7
commit f66a5c4ca6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
View file

@ -126,7 +126,7 @@ object MiddlewareActor {
* `CharacterInfoMessage` packets are bundled by themselves.<br> * `CharacterInfoMessage` packets are bundled by themselves.<br>
* <br> * <br>
* Super awkward special case. * Super awkward special case.
* Bundling `CharacterInfoMessage` with its corresponding `ObjectCreateDetailedMesssage`, * Bundling `CharacterInfoMessage` with its corresponding `ObjectCreateDetailedMessage`,
* which can occur during otherwise careless execution of the character select screen, * which can occur during otherwise careless execution of the character select screen,
* causes the character options to show blank slots and be unusable. * causes the character options to show blank slots and be unusable.
*/ */
@ -228,7 +228,7 @@ class MiddlewareActor(
/** /**
* Increment the outbound subslot number. * Increment the outbound subslot number.
* The previous subslot number is returned. * The previous subslot number is returned.
* The fidelity of the subslot field in `SlottedMetapacket`'s is 16 bits, so wrap back to 0 after 65535. * The fidelity of the subslot field in a `SlottedMetaPacket` is 16 bits, so wrap back to 0 after 65535.
* @return * @return
*/ */
private def nextSubslot: Int = { private def nextSubslot: Int = {
@ -273,7 +273,7 @@ class MiddlewareActor(
private val packetOutboundDelay: Long = Config.app.network.middleware.packetBundlingDelay.toMillis private val packetOutboundDelay: Long = Config.app.network.middleware.packetBundlingDelay.toMillis
/** Delay between runs of the packet bundler/resolver timer (ms); /** Delay between runs of the packet bundler/resolver timer (ms);
* this is the same as `packetOutboundDelay` increased by 1.5x */ * this is the same as `packetOutboundDelay` increased by the multiplier */
private val packetProcessorDelay: FiniteDuration = Duration.apply( private val packetProcessorDelay: FiniteDuration = Duration.apply(
math.abs(packetOutboundDelay * Config.app.network.middleware.packetBundlingDelayMultiplier).toLong, math.abs(packetOutboundDelay * Config.app.network.middleware.packetBundlingDelayMultiplier).toLong,
"milliseconds" "milliseconds"
@ -697,7 +697,7 @@ class MiddlewareActor(
if (bundle.length == 1) { if (bundle.length == 1) {
splitPacket(bundle.head) match { splitPacket(bundle.head) match {
case Seq() => case Seq() =>
//TODO is oversized packet recovery possible? //TODO is over-sized packet recovery possible?
retimePacketProcessorIfWork() retimePacketProcessorIfWork()
case data => case data =>
outQueueBundled.enqueueAll(data) outQueueBundled.enqueueAll(data)