SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2023-06-17 11:41:38 +02:00
parent 20acc420d8
commit f88d039091
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@@ -1329,7 +1329,12 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
for (Object object : addFrom) { for (Object object : addFrom) {
if (!(object instanceof String)) { if (!(object instanceof String)) {
Preconditions.checkArgument(object == null, "%s cannot contain non-string %s", addFrom, object.getClass().getName()); if (object != null) {
// SPIGOT-7399: Null check via if is important,
// otherwise object.getClass().getName() could throw an error for a valid argument -> when it is null which is valid,
// when using Preconditions
throw new IllegalArgumentException(addFrom + " cannot contain non-string " + object.getClass().getName());
}
addTo.add(CraftChatMessage.toJSON(IChatBaseComponent.empty())); addTo.add(CraftChatMessage.toJSON(IChatBaseComponent.empty()));
} else { } else {