From 66e3cb183710c08b2db123e4460265fbf76fa4e5 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Fri, 12 Nov 2021 14:27:26 -0800
Subject: [PATCH] Partially fix #6880 (#6888)

---
 ...e-correct-LevelStem-registry-when-loading-default-.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/patches/server/Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/Use-correct-LevelStem-registry-when-loading-default-.patch
index cfe4689562..3f48147f87 100644
--- a/patches/server/Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -15,8 +15,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
 -            LevelStem worlddimension = (LevelStem) registrymaterials.get(dimensionKey);
 +            // Paper start - Use correct LevelStem registry
-+            LevelStem worlddimension = generatorsettings.dimensions().get(dimensionKey);
-+            if (worlddimension == null) {
++            final LevelStem worlddimension;
++            if (dimensionKey == LevelStem.END || dimensionKey == LevelStem.NETHER) {
++                worlddimension = generatorsettings.dimensions().get(dimensionKey);
++            } else {
 +                worlddimension = registrymaterials.get(dimensionKey);
 +            }
 +            // Paper end