From a49ff1b756fa64b4b1f10b975fd1dd66abb00f87 Mon Sep 17 00:00:00 2001
From: Julian Burner
Date: Thu, 15 Jun 2023 11:01:49 +0200
Subject: Fix `canConflictWith` check for fields (#511)

---
 .../java/cuchaz/enigma/translation/representation/entry/FieldEntry.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
index b4ad1bac..aaa0798c 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
@@ -85,7 +85,7 @@ public class FieldEntry extends ParentedEntry<ClassEntry> implements Comparable<
 
 	@Override
 	public boolean canConflictWith(Entry<?> entry) {
-		return false;
+		return entry instanceof FieldEntry fieldEntry && fieldEntry.getParent().equals(parent);
 	}
 
 	@Override
-- 
cgit v1.2.3