From bb300792007577680e50dbd8a08ae255e68fc03b Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Fri, 2 Oct 2020 14:56:22 +0200
Subject: Only conflict when both methods are not synthetic

---
 .../main/java/cuchaz/enigma/translation/mapping/MappingValidator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'enigma/src')

diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
index 134c05c..a84b0fb 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
@@ -46,7 +46,7 @@ public class MappingValidator {
 				.map(deobfuscator::translate)
 				.collect(Collectors.toList());
 		for (Entry<?> sibling : directTranslatedSiblings) {
-			if (entry.canConflictWith(sibling) && sibling.getName().equals(name) && isSynthetic(entry) == isSynthetic(sibling)) {
+			if (entry.canConflictWith(sibling) && sibling.getName().equals(name) && !isSynthetic(entry) && !isSynthetic(sibling)) {
 				// allow clash if one is synthetic and the other is not
 				Entry<?> parent = entry.getParent();
 				if (parent != null) {
-- 
cgit v1.2.3