From ff583e40fb896d29137f4bfe88a03d4a3252f51e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Wed, 1 Dec 2021 17:04:05 +0100
Subject: [PATCH] Fix 1.18 mountain biomes in biome registry

---
 .../protocol1_17_1to1_18/packets/EntityPackets1_18.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
index c58d114a..e959b47c 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
@@ -34,8 +34,6 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
 
-import java.util.ArrayList;
-
 public final class EntityPackets1_18 extends EntityRewriter<Protocol1_17_1To1_18> {
 
     public EntityPackets1_18(final Protocol1_17_1To1_18 protocol) {
@@ -67,12 +65,11 @@ public final class EntityPackets1_18 extends EntityRewriter<Protocol1_17_1To1_18
                     final CompoundTag registry = wrapper.get(Type.NBT, 0);
                     final CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
                     final ListTag biomes = biomeRegistry.get("value");
-                    for (final Tag biome : new ArrayList<>(biomes.getValue())) {
+                    for (final Tag biome : biomes.getValue()) {
                         final CompoundTag biomeCompound = ((CompoundTag) biome).get("element");
                         final StringTag category = biomeCompound.get("category");
                         if (category.getValue().equals("mountain")) {
-                            biomes.remove(biome);
-                            continue;
+                            category.setValue("extreme_hills");
                         }
 
                         // The client just needs something