Ensure proxiedAddresses is not null before lookup (#4539)

GeyserMC · Apr 1, 2024 · 08aa528 · 08aa528
1 parent fa441f1
commit 08aa528
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
@@ -263,7 +263,10 @@ public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
             ip = "<IP address withheld>";
         }
 
-        ConnectionRequestEvent requestEvent = new ConnectionRequestEvent(inetSocketAddress, this.proxiedAddresses.get(inetSocketAddress));
+        ConnectionRequestEvent requestEvent = new ConnectionRequestEvent(
+            inetSocketAddress, 
+            this.proxiedAddresses != null ? this.proxiedAddresses.get(inetSocketAddress) : null
+        );
         geyser.eventBus().fire(requestEvent);
         if (requestEvent.isCancelled()) {
             geyser.getLogger().debug("Connection request from " + ip + " was cancelled using the API!");