From 9089ff1f8d5da32f712929f77999fb4b9d10f5b5 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Thu, 23 Jan 2020 19:34:11 -0800 Subject: [PATCH] Add catch for null chat packet, for #2129 --- .../denizen/utilities/packets/DenizenPacketHandler.java | 3 +++ .../nms/v1_15/impl/network/packets/PacketOutChatImpl.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java index d9be09c6a0..8fbced5e72 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java @@ -93,6 +93,9 @@ public boolean sendPacket(final Player player, final PacketOutChat chat) { if (ExecuteCommand.silencedPlayers.contains(player.getUniqueId())) { return true; } + if (chat.getMessage() == null) { + return false; + } final PlayerReceivesMessageScriptEvent event = PlayerReceivesMessageScriptEvent.instance; if (event.loaded) { Callable eventCall = new Callable() { diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/packets/PacketOutChatImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/packets/PacketOutChatImpl.java index 974a81bb5f..42f0267e0c 100644 --- a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/packets/PacketOutChatImpl.java +++ b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/packets/PacketOutChatImpl.java @@ -31,8 +31,10 @@ public PacketOutChatImpl(PacketPlayOutChat internal) { rawJson = IChatBaseComponent.ChatSerializer.a(baseComponent); } else { - message = BaseComponent.toPlainText(internal.components); - rawJson = ComponentSerializer.toString(internal.components); + if (internal.components != null) { + message = BaseComponent.toPlainText(internal.components); + rawJson = ComponentSerializer.toString(internal.components); + } bungee = true; } position = (ChatMessageType) POSITION.get(internal);