upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE caused by canceling onServerChatEvent (#8516)

Browse Source
This commit is contained in:
Joseph Tarbit authored and GitHub committed 2022-03-17 12:59:20 -07:00
1 parent ad75cb8644
commit de1050e420
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+2 -1
View File
@@ -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;