From 3c61083c72ffa465be38b85c4ed183c1e7eb191e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 08:51:04 -0400 Subject: [PATCH 1/2] fix missing | on dupe uuid patch --- Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch index a1ba04f504..e4bfe005a0 100644 --- a/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch @@ -119,7 +119,7 @@ index 4757081090..8cd2ed85bc 100644 List entityslice = aentityslice[j]; // Spigot + // Paper start + DuplicateUUIDMode mode = world.paperConfig.duplicateUUIDMode; -+ if (mode == DuplicateUUIDMode.WARN | mode == DuplicateUUIDMode.DELETE || mode == DuplicateUUIDMode.REGEN || mode == DuplicateUUIDMode.SAFE_REGEN) { ++ if (mode == DuplicateUUIDMode.WARN || mode == DuplicateUUIDMode.DELETE || mode == DuplicateUUIDMode.REGEN || mode == DuplicateUUIDMode.SAFE_REGEN) { + Map thisChunk = new HashMap<>(); + for (Iterator iterator = ((List) entityslice).iterator(); iterator.hasNext(); ) { + Entity entity = iterator.next(); From 22b2bf6270a1c7adf5ed5486cbdbec557ee5ca70 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Fri, 3 Aug 2018 16:25:21 +0300 Subject: [PATCH 2/2] Fix "MC-135506: Experience should save as Integers" still saving as short" (#1301) --- .../0347-MC-135506-Experience-should-save-as-Integers.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0347-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0347-MC-135506-Experience-should-save-as-Integers.patch index c2eea1f082..bfc0051bf2 100644 --- a/Spigot-Server-Patches/0347-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0347-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From 3ee5221ba7dae7751cd0ed9cdfacbf358484ae53 Mon Sep 17 00:00:00 2001 +From ac00b144ea5c59904530bae2a8697b9f05892649 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 1c59fd9661..c179fe516e 100644 +index 1c59fd96..becb102c 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -193,14 +193,14 @@ public class EntityExperienceOrb extends Entity { @@ -13,7 +13,7 @@ index 1c59fd9661..c179fe516e 100644 nbttagcompound.setShort("Health", (short) this.d); nbttagcompound.setShort("Age", (short) this.b); - nbttagcompound.setShort("Value", (short) this.value); -+ nbttagcompound.setInt("Value", (short) this.value); // Paper - save as Integer ++ nbttagcompound.setInt("Value", this.value); // Paper - save as Integer savePaperNBT(nbttagcompound); // Paper }