mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
57dd397155
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 Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From fdee18aff4e9d98ff3663693cafbe5f8c362dc73 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.26.2
|
|
|