Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd

Browse Source
This commit is contained in:
DerFrZocker 2023-06-17 11:41:38 +02:00 committed by md_5
parent 44a4b5649d
commit fcff84de91
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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 {