fix overwrite, static shadows not being remapped at runtime

FabricMC · Sep 16, 2019 · ec491e3 · ec491e3
1 parent 59db546
commit ec491e3
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
@@ -419,9 +419,6 @@ protected boolean attachSpecialMethod(MixinTargetContext context, MixinMethodNod
         Method method = this.getSpecialMethod(mixinMethod, type);
         MethodNode target = context.findMethod(mixinMethod, annotation);
         if (target == null) {
-            if (type.isOverwrite) {
-                return false;
-            }
             target = context.findRemappedMethod(mixinMethod);
             if (target == null) {
                 throw new InvalidMixinException(this.mixin,
@@ -731,7 +728,9 @@ protected void transformMethod(MethodInsnNode methodNode) {
             throw new RuntimeException(new ClassNotFoundException(methodNode.owner.replace('/', '.')));
         }
 
-        Method method = owner.findMethodInHierarchy(methodNode, SearchType.ALL_CLASSES, ClassInfo.INCLUDE_PRIVATE);
+        int includeStatic = (methodNode.getOpcode() == Opcodes.INVOKESTATIC
+                ? ClassInfo.INCLUDE_STATIC : 0);
+        Method method = owner.findMethodInHierarchy(methodNode, SearchType.ALL_CLASSES, ClassInfo.INCLUDE_PRIVATE | includeStatic);
         metaTimer.end();
 
         if (method != null && method.isRenamed()) {
@@ -747,8 +746,10 @@ protected void transformField(FieldInsnNode fieldNode) {
         if (owner == null) {
             throw new RuntimeException(new ClassNotFoundException(fieldNode.owner.replace('/', '.')));
         }
-
-        Field field = owner.findField(fieldNode, ClassInfo.INCLUDE_PRIVATE);
+
+        int includeStatic = ((fieldNode.getOpcode() == Opcodes.GETSTATIC || fieldNode.getOpcode() == Opcodes.PUTSTATIC)
+                ? ClassInfo.INCLUDE_STATIC : 0);
+        Field field = owner.findField(fieldNode, ClassInfo.INCLUDE_PRIVATE | includeStatic);
         metaTimer.end();
 
         if (field != null && field.isRenamed()) {