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

---
 build.gradle                                                            | 2 +-
 .../main/java/cuchaz/enigma/translation/mapping/MappingValidator.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e341c616..cea13a1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ subprojects {
     }
 
     group = 'cuchaz'
-    version = '0.21.1'
+    version = '0.21.2'
 
     def buildNumber = System.getenv("BUILD_NUMBER")
     version = version + "+" + (buildNumber ? "build.$buildNumber" : "local")
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 134c05ce..a84b0fb3 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