geforkt von Mirrors/Paper
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
24 Zeilen
1.0 KiB
Diff
24 Zeilen
1.0 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/chat/ChatSender.java b/src/main/java/net/minecraft/network/chat/ChatSender.java
|
|
index eb33c74d51f9b096ac39adf167fa09afdaa5e56b..d3d5487e9a4e95271a88c094058ec9d37a10d370 100644
|
|
--- a/src/main/java/net/minecraft/network/chat/ChatSender.java
|
|
+++ b/src/main/java/net/minecraft/network/chat/ChatSender.java
|
|
@@ -8,6 +8,12 @@ import net.minecraft.world.entity.player.ProfilePublicKey;
|
|
public record ChatSender(UUID profileId, @Nullable ProfilePublicKey profilePublicKey) {
|
|
public static final ChatSender SYSTEM = new ChatSender(Util.NIL_UUID, (ProfilePublicKey)null);
|
|
|
|
+ // Paper start
|
|
+ public ChatSender {
|
|
+ com.google.common.base.Preconditions.checkNotNull(profileId, "uuid cannot be null");
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public boolean isSystem() {
|
|
return SYSTEM.equals(this);
|
|
}
|