From de1050e42048fa51f6842df5866decd5f9ddd5a7 Mon Sep 17 00:00:00 2001
From: Joseph Tarbit <joetarbit@gmail.com>
Date: Thu, 17 Mar 2022 19:59:20 +0000
Subject: [PATCH] Fix NPE caused by canceling onServerChatEvent (#8516)

---
 .../server/network/ServerGamePacketListenerImpl.java.patch     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
index 023b4eab07..4e2fa053bf 100644
--- a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+++ b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -41,12 +41,13 @@
  
        for(int i = 0; i < s.length(); ++i) {
           if (!SharedConstants.m_136188_(s.charAt(i))) {
-@@ -1129,8 +_,10 @@
+@@ -1129,8 +_,11 @@
              String s1 = p_143629_.m_143722_();
              Component component = s1.isEmpty() ? null : new TranslatableComponent("chat.type.text", this.f_9743_.m_5446_(), s1);
              Component component1 = new TranslatableComponent("chat.type.text", this.f_9743_.m_5446_(), s);
 +            component1 = net.minecraftforge.common.ForgeHooks.onServerChatEvent(this, s, component1);
 +            Component finalComponent = component1;
++            if (finalComponent != null) 
              this.f_9745_.m_6846_().m_143991_(component1, (p_184197_) -> {
 -               return this.f_9743_.m_143421_(p_184197_) ? component : component1;
 +               return this.f_9743_.m_143421_(p_184197_) ? component : finalComponent;