diff --git a/invui/src/main/java/xyz/xenondevs/invui/internal/network/PacketListener.java b/invui/src/main/java/xyz/xenondevs/invui/internal/network/PacketListener.java index 575e11c4..20b412ac 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/internal/network/PacketListener.java +++ b/invui/src/main/java/xyz/xenondevs/invui/internal/network/PacketListener.java @@ -47,7 +47,9 @@ public void discard(Player player, Class> clazz) { - getPacketHandler(player.getUniqueId()).discardRules.remove(clazz); + var packetHandler = packetHandlers.get(player.getUniqueId()); + if (packetHandler != null) + packetHandler.discardRules.remove(clazz); } public void injectOutgoing(Player player, List> packets) { @@ -66,7 +68,8 @@ public > void redirectIncomin } public boolean removeRedirect(Player player, Class> clazz) { - return getPacketHandler(player.getUniqueId()).redirections.remove(clazz) != null; + var packetHandler = packetHandlers.get(player.getUniqueId()); + return packetHandler != null && packetHandler.redirections.remove(clazz) != null; } @SuppressWarnings("unchecked") @@ -75,7 +78,8 @@ public > void listenIncoming( } public boolean stopListening(Player player, Class> clazz) { - return getPacketHandler(player.getUniqueId()).listeners.remove(clazz) != null; + var packetHandler = packetHandlers.get(player.getUniqueId()); + return packetHandler != null && packetHandler.listeners.remove(clazz) != null; } private PacketHandler getPacketHandler(UUID uuid) {