diff options
| author | Aizistral | 2022-11-02 21:53:11 +0100 |
|---|---|---|
| committer | Aizistral | 2022-11-02 21:53:11 +0100 |
| commit | bad74589dfe03e600d0f7b6655699a170c9e01f9 (patch) | |
| tree | 8738926c02dedd3ea9bf5ae28fbf00b47f9546d6 | |
| parent | 5594a61b3a7bf858add77f30396069adb51d8bd9 (diff) | |
Fix conversion
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java index ec3caa8..395f317 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -11,6 +11,7 @@ import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import net.minecraft.network.PacketSendListener; +import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; @@ -33,13 +34,15 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); } if (NCRConfig.getCommon().convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) - .get().decorate(chat.unsignedContent()), false); + .get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() + : Component.literal(chat.body().content())), false); info.cancel(); this.send(packet); @@ -56,7 +59,8 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); } if (NCRConfig.getCommon().convertToGameMessage()) { |
