Don't merge names/descriptions if they are equal to the existing ones

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 4 years ago
parent 509d88b18f
commit 5d7bf1d59b
  1. 4
      archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt

@ -383,7 +383,7 @@ public class CacheImporter @Inject constructor(
if (overwrite) { if (overwrite) {
newName = name newName = name
} else if (oldName != null && name != null) { } else if (oldName != null && name != null && oldName != name) {
newName = "$oldName/$name" newName = "$oldName/$name"
} else if (oldName != null) { } else if (oldName != null) {
newName = oldName newName = oldName
@ -393,7 +393,7 @@ public class CacheImporter @Inject constructor(
if (overwrite) { if (overwrite) {
newDescription = description newDescription = description
} else if (oldDescription != null && description != null) { } else if (oldDescription != null && description != null && oldDescription != description) {
newDescription = "$oldDescription\n\n$description" newDescription = "$oldDescription\n\n$description"
} else if (oldDescription != null) { } else if (oldDescription != null) {
newDescription = oldDescription newDescription = oldDescription

Loading…
Cancel
Save