0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From 7c6a5a037b4afb0148ae12995168cf93a4ef452c Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 22 Sep 2018 18:41:01 -0400
|
|
Subject: [PATCH] Remove Precondition on name for AttributeModifier
|
|
|
|
Vanilla allows empty names
|
|
|
|
diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
|
|
index a97631474..f0dff145a 100644
|
|
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
|
|
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
|
|
@@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable {
|
|
|
|
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @Nullable EquipmentSlot slot) {
|
|
Validate.notNull(uuid, "UUID cannot be null");
|
|
- Validate.notEmpty(name, "Name cannot be empty");
|
|
+ //Validate.notEmpty(name, "Name cannot be empty"); // Paper
|
|
Validate.notNull(operation, "Operation cannot be null");
|
|
this.uuid = uuid;
|
|
- this.name = name;
|
|
+ this.name = name != null ? name : ""; // Paper
|
|
this.amount = amount;
|
|
this.operation = operation;
|
|
this.slot = slot;
|
|
--
|
|
2.21.0
|
|
|