PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-20 02:24:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow multiple OCDM per bundle

Browse source
This commit is contained in:
Jakob Gillich 2020-09-27 00:43:56 +02:00
parent 4dd414589b
commit fdc87516c1
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,9 +181,15 @@ class MiddlewareActor(
packet match {
// Super awkward special case: Bundling CharacterInfoMessage with OCDM causes the character selection
// to show blank lines and be broken. So we only dequeue either if they are the first packet.
case _: CharacterInfoMessage | _: ObjectCreateDetailedMessage =>
length == packetLength
// to show blank lines and be broken. So we make sure CharacterInfoMessage is always sent as the only
// packet in a bundle.
case _: CharacterInfoMessage =>
if (length == packetLength) {
length += MTU
true
} else {
false
}
case _ =>
// Some packets may be larger than the MTU limit, in that case we dequeue anyway and split later
// We deduct some bytes to leave room for SlottedMetaPacket (4 bytes) and MultiPacketEx (2 bytes + prefix per packet)