From 4d4940a3b96b105e872a6be1416de8320884db3b Mon Sep 17 00:00:00 2001
From: BruceChen <MrChen131217@gmail.com>
Date: Wed, 7 Sep 2022 00:08:31 +0800
Subject: [PATCH] Trim

---
 MinecraftClient/Mapping/World.cs                | 10 ++++------
 MinecraftClient/Protocol/Handlers/Protocol18.cs |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs
index eea24e59..47a768ad 100644
--- a/MinecraftClient/Mapping/World.cs
+++ b/MinecraftClient/Mapping/World.cs
@@ -65,19 +65,17 @@ namespace MinecraftClient.Mapping
             foreach (Dictionary<string, object> dimensionNbt in dimensionListNbt)
             {
                 string dimensionName = (string)dimensionNbt["name"];
-                Dictionary<string, object> element = (Dictionary<string, object>)dimensionNbt["element"];
-                if (dimensionList.ContainsKey(dimensionName))
-                    dimensionList.Remove(dimensionName);
-                dimensionList.Add(dimensionName, new Dimension(dimensionName, element));
+                Dictionary<string, object> dimensionType = (Dictionary<string, object>)dimensionNbt["element"];
+                StoreOneDimension(dimensionName, dimensionType);
             }
         }
 
         /// <summary>
-        /// Store one dimension - 1.16.2 to 1.18.2
+        /// Store one dimension - Directly used in 1.16.2 to 1.18.2
         /// </summary>
         /// <param name="dimensionName">Dimension name</param>
         /// <param name="dimensionType">Dimension Type nbt data</param>
-        public static void StoreDimension(string dimensionName, Dictionary<string, object> dimensionType)
+        public static void StoreOneDimension(string dimensionName, Dictionary<string, object> dimensionType)
         {
             if (dimensionList.ContainsKey(dimensionName))
                     dimensionList.Remove(dimensionName);
diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs
index f60b62f4..a00011ce 100644
--- a/MinecraftClient/Protocol/Handlers/Protocol18.cs
+++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs
@@ -406,7 +406,7 @@ namespace MinecraftClient.Protocol.Handlers
                                 if (handler.GetTerrainEnabled())
                                 {
                                     if (protocolVersion >= MC_1_16_2_Version && protocolVersion < MC_1_19_Version)
-                                        World.StoreDimension(dimensionName, dimensionType!);
+                                        World.StoreOneDimension(dimensionName, dimensionType!);
                                     World.SetDimension(dimensionName);
                                 }
                             }
@@ -623,7 +623,7 @@ namespace MinecraftClient.Protocol.Handlers
                                 if (handler.GetTerrainEnabled())
                                 {
                                     if (protocolVersion >= MC_1_16_2_Version && protocolVersion < MC_1_19_Version)
-                                        World.StoreDimension(dimensionName, dimensionTypeRespawn!);
+                                        World.StoreOneDimension(dimensionName, dimensionTypeRespawn!);
                                     World.SetDimension(dimensionName);
                                 }
                             }