From bc7442d306603e5e280c441d3ffcd501926ca591 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 4 Oct 2020 21:31:59 +0100 Subject: [PATCH] Hotfix for obfuscation lookup fix which fixes lookups in superclasses Fixes bug introduced in 54681f0b766cf117de254441db69fa9695c25081 which prevents lookups in indirect superclasses from resolving correctly --- .../tools/obfuscation/ObfuscationDataProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java index 9943f6c72..0cfa32346 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java @@ -108,6 +108,7 @@ private ObfuscationData getObfEntryRecursive(ITargetSelectorRemappable ta ObfuscationData obfData; TypeHandle superClass = targetType.getSuperclass(); for (TypeHandle iface : targetType.getInterfaces()) { + obfData = this.getObfEntryUsing(targetMember, iface); if (!obfData.isEmpty()) { return obfData; @@ -125,7 +126,6 @@ private ObfuscationData getObfEntryRecursive(ITargetSelectorRemappable ta return obfData; } - this.getObfEntryRecursive(targetMember.move(superClass.getName()), visited); return this.getObfEntryRecursive(targetMember.move(superClass.getName()), visited); }