ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
28 Zeilen
1.2 KiB
Diff
28 Zeilen
1.2 KiB
Diff
From e6fe9e0337266d2cfcae640d7ee44f840f4305bc 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
|
|
|