mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
be13705177
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 CraftBukkit Changes: 6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: CDFN <codefun@protonmail.com>
|
|
Date: Tue, 7 Jul 2020 17:53:23 +0200
|
|
Subject: [PATCH] Return chat component with empty text instead of throwing
|
|
exception
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/Container.java b/src/main/java/net/minecraft/world/inventory/Container.java
|
|
index 9c6330da4e026a7753698b5d103c009730154c3e..bdd00608a72dd81003731ff5fbe774dfdc5220e5 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/Container.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/Container.java
|
|
@@ -11,6 +11,7 @@ import net.minecraft.CrashReportSystemDetails;
|
|
import net.minecraft.ReportedException;
|
|
import net.minecraft.core.IRegistry;
|
|
import net.minecraft.core.NonNullList;
|
|
+import net.minecraft.network.chat.ChatComponentText;
|
|
import net.minecraft.server.level.EntityPlayer;
|
|
import net.minecraft.util.MathHelper;
|
|
import net.minecraft.world.IInventory;
|
|
@@ -61,7 +62,12 @@ public abstract class Container {
|
|
}
|
|
private IChatBaseComponent title;
|
|
public final IChatBaseComponent getTitle() {
|
|
- Preconditions.checkState(this.title != null, "Title not set");
|
|
+ // Paper start - return chat component with empty text instead of throwing error
|
|
+ // Preconditions.checkState(this.title != null, "Title not set");
|
|
+ if(this.title == null){
|
|
+ return new ChatComponentText("");
|
|
+ }
|
|
+ // Paper end
|
|
return this.title;
|
|
}
|
|
public final void setTitle(IChatBaseComponent title) {
|