From 641297497abf26886f2f11f24d2978143fad5c33 Mon Sep 17 00:00:00 2001
From: Hannes Greule <SirYwell@users.noreply.github.com>
Date: Mon, 4 Mar 2024 07:32:33 +0100
Subject: [PATCH] Maintain insertion order for RandomPattern sub-patterns
 (#2603)

---
 .../core/util/collection/RandomCollection.java                | 2 +-
 .../com/sk89q/worldedit/function/pattern/RandomPattern.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/collection/RandomCollection.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/collection/RandomCollection.java
index a157ebd7c..6214777e5 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/collection/RandomCollection.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/collection/RandomCollection.java
@@ -33,7 +33,7 @@ public abstract class RandomCollection<T> {
     public static <T> RandomCollection<T> of(Map<T, Double> weights, SimpleRandom random) {
         checkNotNull(random);
         return FastRandomCollection.create(weights, random)
-                .orElse(new SimpleRandomCollection<>(weights, random));
+                .orElseGet(() -> new SimpleRandomCollection<>(weights, random));
     }
 
     public void setRandom(SimpleRandom random) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
index 0568fd5b8..1d2df7223 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
@@ -27,7 +27,7 @@ import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -41,7 +41,7 @@ public class RandomPattern extends AbstractPattern {
 
     //FAWE start - SimpleRandom > Random, LHS<P> > List
     private final SimpleRandom random;
-    private Map<Pattern, Double> weights = new HashMap<>();
+    private Map<Pattern, Double> weights = new LinkedHashMap<>();
     private RandomCollection<Pattern> collection;
     private LinkedHashSet<Pattern> patterns = new LinkedHashSet<>();
     //FAWE end