From 7f00a41dd5c94a3a6eb71529caebe60ddd215161 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Fri, 2 Aug 2019 22:43:10 +0200 Subject: [PATCH] Fix NullPointerException when using a proxy --- .../hooks/network/VanillaPacketInterceptorInjector.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/clayborn/universalremote/hooks/network/VanillaPacketInterceptorInjector.java b/src/main/java/clayborn/universalremote/hooks/network/VanillaPacketInterceptorInjector.java index 28057f4..81cdda2 100644 --- a/src/main/java/clayborn/universalremote/hooks/network/VanillaPacketInterceptorInjector.java +++ b/src/main/java/clayborn/universalremote/hooks/network/VanillaPacketInterceptorInjector.java @@ -14,6 +14,10 @@ public void onClientConnectedToServerEvent(ClientConnectedToServerEvent event) { Util.logger.info("Injecting vanilla packet interceptors..."); + if (event.getManager().channel().pipeline().get("universalremote_join_game_handler") != null) + event.getManager().channel().pipeline().remove("universalremote_join_game_handler"); + if (event.getManager().channel().pipeline().get("universalremote_respawn_handler") != null) + event.getManager().channel().pipeline().remove("universalremote_respawn_handler"); event.getManager().channel().pipeline().addBefore("packet_handler", "universalremote_join_game_handler", new JoinGameInterceptor(event.getManager())); event.getManager().channel().pipeline().addBefore("packet_handler", "universalremote_respawn_handler", new RespawnInterceptor(event.getManager())); }