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

Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12

Browse Source
This commit is contained in:
Adrian Siekierka 2022-06-08 20:00:08 +02:00
commit ca76c81b32
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/common/PacketHandler.scala
View File

@ -48,13 +48,18 @@ abstract class PacketHandler {
// Don't crash on badly formatted packets (may have been altered by a
// malicious client, in which case we don't want to allow it to kill the
// server like this). Just spam the log a bit... ;)
var stream: InputStream = null
try {
val stream = new ByteBufInputStream(data)
if (stream.read() == 0) dispatch(new PacketParser(stream, player))
else dispatch(new PacketParser(new InflaterInputStream(stream), player))
stream = new ByteBufInputStream(data)
if (stream.read() != 0) stream = new InflaterInputStream(stream)
dispatch(new PacketParser(stream, player))
} catch {
case e: Throwable =>
OpenComputers.log.warn("Received a badly formatted packet.", e)
} finally {
if (stream != null) {
stream.close()
}
}
// Avoid AFK kicks by marking players as non-idle when they send packets.