diff options
| author |  Julian Burner | 2023-06-15 11:01:49 +0200 |
|---|---|---|
| committer |  GitHub | 2023-06-15 10:01:49 +0100 |
| commit | a49ff1b756fa64b4b1f10b975fd1dd66abb00f87 (patch) | |
| tree | 11487241e01e50b7c87ad10e3af7d1f85ed0a2f7 | |
| parent | Fix NullPointerException when checking if a class is a record due to super cl... (diff) | |
| download | enigma-a49ff1b756fa64b4b1f10b975fd1dd66abb00f87.tar.gz enigma-a49ff1b756fa64b4b1f10b975fd1dd66abb00f87.tar.xz enigma-a49ff1b756fa64b4b1f10b975fd1dd66abb00f87.zip | |
Fix `canConflictWith` check for fields (#511)
| -rw-r--r-- | enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java | 2 |
1 files changed, 1 insertions, 1 deletions
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< | |||
| 85 | 85 | ||
| 86 | @Override | 86 | @Override |
| 87 | public boolean canConflictWith(Entry<?> entry) { | 87 | public boolean canConflictWith(Entry<?> entry) { |
| 88 | return false; | 88 | return entry instanceof FieldEntry fieldEntry && fieldEntry.getParent().equals(parent); |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | @Override | 91 | @Override |