From c5f63b4d6515b942d0bd40857032d92ddbf8d2c3 Mon Sep 17 00:00:00 2001
From: HarvelsX <xharvels@gmail.com>
Date: Fri, 24 Dec 2021 22:43:39 +0300
Subject: [PATCH] Put award native advancement in one for...each;

---
 .../husksync/bukkit/util/PlayerSetter.java    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
index 8a978748..265f1d18 100644
--- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
+++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
@@ -284,7 +284,6 @@ public class PlayerSetter {
         // Clear
         AdvancementUtils.clearPlayerAdvancementsMap(playerAdvancements);
 
-        final Map<Object, List<String>> syncAdvancementMap = new HashMap<>();
         advancementRecords.forEach(advancementRecord -> {
             NamespacedKey namespacedKey = Objects.requireNonNull(
                     NamespacedKey.fromString(advancementRecord.advancementKey()),
@@ -297,23 +296,21 @@ public class PlayerSetter {
                 return;
             }
 
-            syncAdvancementMap.put(
-                    AdvancementUtils.getHandle(bukkitAdvancement),
-                    advancementRecord.awardedAdvancementCriteria()
-            );
-        });
+            // todo: sync date of get advancement
+            Date date = Date.from(Instant.now().minus(Period.ofWeeks(1)));
 
-        // todo: sync date of get advancement
-        Date date = Date.from(Instant.now().minus(Period.ofWeeks(1)));
+            Object advancement = AdvancementUtils.getHandle(bukkitAdvancement);
+            List<String> criteriaList = advancementRecord.awardedAdvancementCriteria();
+            {
+                Map<String, Object> nativeCriteriaMap = new HashMap<>();
+                criteriaList.forEach(criteria ->
+                        nativeCriteriaMap.put(criteria, AdvancementUtils.newCriterionProgress(date))
+                );
+                Object nativeAdvancementProgress = AdvancementUtils.newAdvancementProgress(nativeCriteriaMap);
 
-        syncAdvancementMap.forEach((advancement, criteriaList) -> {
-            Map<String, Object> nativeCriteriaMap = new HashMap<>();
-            criteriaList.forEach(criteria ->
-                    nativeCriteriaMap.put(criteria, AdvancementUtils.newCriterionProgress(date))
-            );
-            Object nativeAdvancementProgress = AdvancementUtils.newAdvancementProgress(nativeCriteriaMap);
+                AdvancementUtils.startProgress(playerAdvancements, advancement, nativeAdvancementProgress);
 
-            AdvancementUtils.startProgress(playerAdvancements, advancement, nativeAdvancementProgress);
+            }
         });
 
         AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements);