Updated Upstream (Bukkit/CraftBukkit)

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:
39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers

CraftBukkit Changes:
1cf8b5dc SPIGOT-4400: Populators running on existing chunks
116cb9a1 SPIGOT-4399: Add attribute modifier equality test
5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
This commit is contained in:
Aikar 2018-09-28 19:31:59 -04:00
parent afeb77bc88
commit b62dfa0bf9
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
346 changed files with 758 additions and 881 deletions

View file

@ -1,4 +1,4 @@
From 02ea14d151acf44e283dee55d8ed2daf733704ef Mon Sep 17 00:00:00 2001
From 7a42dca8e149969ed13cdae48a9cdf98262a3319 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
@ -6,10 +6,10 @@ 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 a3a69ffa4..4d1691be0 100644
index 2bc9878ff..0943eee46 100644
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
@@ -29,10 +29,10 @@ public class AttributeModifier implements ConfigurationSerializable {
@@ -30,10 +30,10 @@ public class AttributeModifier implements ConfigurationSerializable {
public AttributeModifier(UUID uuid, String name, double amount, Operation operation, EquipmentSlot slot) {
Validate.notNull(uuid, "UUID cannot be null");