From 5d7bf1d59b2f017a9341151767aea4387dd48740 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Sat, 6 Mar 2021 11:53:27 +0000
Subject: [PATCH] Don't merge names/descriptions if they are equal to the
 existing ones

Signed-off-by: Graham <gpe@openrs2.org>
---
 .../main/kotlin/org/openrs2/archive/cache/CacheImporter.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt
index a4cf8be3..3f566283 100644
--- a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt
@@ -383,7 +383,7 @@ public class CacheImporter @Inject constructor(
 
                     if (overwrite) {
                         newName = name
-                    } else if (oldName != null && name != null) {
+                    } else if (oldName != null && name != null && oldName != name) {
                         newName = "$oldName/$name"
                     } else if (oldName != null) {
                         newName = oldName
@@ -393,7 +393,7 @@ public class CacheImporter @Inject constructor(
 
                     if (overwrite) {
                         newDescription = description
-                    } else if (oldDescription != null && description != null) {
+                    } else if (oldDescription != null && description != null && oldDescription != description) {
                         newDescription = "$oldDescription\n\n$description"
                     } else if (oldDescription != null) {
                         newDescription = oldDescription