Paper/patches/unapplied/server/0418-Optimize-NetworkManager-Exception-Handling.patch

36 lines
2.0 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sun, 5 Jul 2020 22:38:18 -0400
Subject: [PATCH] Optimize NetworkManager Exception Handling
diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java
index 9d6dafb4855af9ccb7bc033ebf0fca5f75ceb9c6..347c4eff66ec1f3393494133ca59df2411dafa21 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
+++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java
@@ -590,6 +590,7 @@ public enum ConnectionProtocol {
2021-06-11 14:02:28 +02:00
@Nullable
2021-06-14 11:46:59 +02:00
public Packet<?> createPacket(int id, FriendlyByteBuf buf) {
+ if (id < 0 || id >= this.idToDeserializer.size()) return null; // Paper - Perf: Optimize exception handling
2023-09-23 00:33:14 +02:00
Function<FriendlyByteBuf, ? extends Packet<? super T>> function = this.idToDeserializer.get(id);
return (Packet<?>)(function != null ? function.apply(buf) : null);
2021-06-14 11:46:59 +02:00
}
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
index 421dd76816063d56ea80339b77531729edd6aa55..1523d69b7b332f0085f40310a94d406da6513edc 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
+++ b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
2023-09-23 00:33:14 +02:00
@@ -39,6 +39,12 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder {
}
2021-06-11 14:02:28 +02:00
2021-06-14 11:46:59 +02:00
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) {
+ // Paper start - Perf: Optimize exception handling; if channel is not active just discard the packet
2021-06-14 11:46:59 +02:00
+ if (!channelHandlerContext.channel().isActive()) {
+ byteBuf.skipBytes(byteBuf.readableBytes());
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // Paper end - Perf: Optimize exception handling
2021-06-14 11:46:59 +02:00
byteBuf.markReaderIndex();
2023-09-23 00:33:14 +02:00
this.helperBuf.clear();
if (!copyVarint(byteBuf, this.helperBuf)) {