Add catch for null chat packet, for #2129

DenizenScript · Jan 24, 2020 · 9089ff1 · 9089ff1
1 parent 18fb805
commit 9089ff1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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<Boolean> eventCall = new Callable<Boolean>() {

diff --git a/...main/java/com/denizenscript/denizen/nms/v1_15/impl/network/packets/PacketOutChatImpl.java b/...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);