mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sun, 28 Jun 2020 19:36:55 -0400
|
||
|
|
Subject: [PATCH] Don't allow null UUID's for chat
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
|
||
|
|
index 002a6c7933f64405707d7d34d3e5c17584539623..a983785bf3bc43f65bd0809870c14a9fd30a3fc1 100644
|
||
|
|
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
|
||
|
|
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
|
||
|
|
@@ -3,6 +3,7 @@ package net.minecraft.network.protocol.game;
|
||
|
|
|
||
|
|
import java.io.IOException;
|
||
|
|
import java.util.UUID;
|
||
|
|
+import net.minecraft.Util;
|
||
|
|
import net.minecraft.network.FriendlyByteBuf;
|
||
|
|
import net.minecraft.network.chat.ChatType;
|
||
|
|
import net.minecraft.network.chat.Component;
|
||
|
|
@@ -21,7 +22,7 @@ public class ClientboundChatPacket implements Packet<ClientGamePacketListener> {
|
||
|
|
public ClientboundChatPacket(Component message, ChatType location, UUID senderUuid) {
|
||
|
|
this.message = message;
|
||
|
|
this.type = location;
|
||
|
|
- this.sender = senderUuid;
|
||
|
|
+ this.sender = senderUuid != null ? senderUuid : Util.getNullUUID(); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override
|