mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
5c7081fecc
* 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From 8f9018e6a58b04dc2a4ffc194859a002a64cf222 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
|
|
|