From 22722051bce39212cd0033fb2ee499d8996d6d01 Mon Sep 17 00:00:00 2001
From: damiantw <damian.crisafulli@troyweb.com>
Date: Mon, 16 Dec 2024 19:28:58 -0500
Subject: [PATCH] [BUGFIX] Prevent NPE on WS decode without SSL config

---
 server/src/com/openrsc/server/net/RSCMultiPortDecoder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/com/openrsc/server/net/RSCMultiPortDecoder.java b/server/src/com/openrsc/server/net/RSCMultiPortDecoder.java
index ed6b28a7d..f8298a6d9 100644
--- a/server/src/com/openrsc/server/net/RSCMultiPortDecoder.java
+++ b/server/src/com/openrsc/server/net/RSCMultiPortDecoder.java
@@ -8,7 +8,6 @@
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
-import io.netty.handler.ssl.OptionalSslHandler;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 import io.netty.util.AttributeMap;
@@ -52,7 +51,9 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
 	}
 
 	private void addWebHandlerStack(ChannelHandlerContext ctx) {
-		ctx.pipeline().addFirst(new OptionalSslHandler(this.server.getSSLContext()));
+		if (server.getSSLContext() != null) {
+			ctx.pipeline().addFirst(server.getSSLContext().newHandler(ctx.alloc()));
+		}
 		ctx.pipeline().addBefore(Server.rscConnectionHandlerId, "httpcodec", new HttpServerCodec());
 		ctx.pipeline().addBefore(Server.rscConnectionHandlerId, "aggregator", new HttpObjectAggregator(65536));
 		ctx.pipeline().addBefore(Server.rscConnectionHandlerId, "httphandler", new HttpRequestHandler("/"));