Partly revert FabricMC@ec491e3 to fix FabricMC#28 (FabricMC#33)

HowardZHY · Aug 6, 2020 · 48833b3 · 48833b3
1 parent 5e8e992
commit 48833b3
Showing 1 changed file with 2 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
@@ -770,13 +770,9 @@ protected void transformMemberReference(MemberRef ref) {
 
         ClassInfo.Member member;
         if (ref.isField()) {
-            int includeStatic = ((ref.getOpcode() == Opcodes.GETSTATIC || ref.getOpcode() == Opcodes.PUTSTATIC)
-                    ? ClassInfo.INCLUDE_STATIC : 0);
-            member = owner.findField(ref.getName(), ref.getDesc(), ClassInfo.INCLUDE_PRIVATE | includeStatic);
+            member = owner.findField(ref.getName(), ref.getDesc(), ClassInfo.INCLUDE_PRIVATE);
         } else {
-            int includeStatic = (ref.getOpcode() == Opcodes.INVOKESTATIC
-                    ? ClassInfo.INCLUDE_STATIC : 0);
-            member = owner.findMethodInHierarchy(ref.getName(), ref.getDesc(), SearchType.ALL_CLASSES, ClassInfo.INCLUDE_PRIVATE | includeStatic);
+            member = owner.findMethodInHierarchy(ref.getName(), ref.getDesc(), SearchType.ALL_CLASSES, ClassInfo.INCLUDE_PRIVATE);
         }
 
         metaTimer.end();