2 files changed, 17 insertions, 4 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index c1992259..4a945cdb 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -603,8 +603,10 @@ public class Deobfuscator {
                         if (((MethodEntry) obfEntry).isConstructor()) {
                                 throw new IllegalArgumentException("Cannot rename constructors");
                         }
+
                         this.renamer.setMethodTreeName((MethodEntry) obfEntry, newName);
                 } else if (obfEntry instanceof LocalVariableEntry) {
+                        // TODO: Discern between arguments (propagate) and local vars (don't)
                         this.renamer.setLocalVariableTreeName((LocalVariableEntry) obfEntry, newName);
                 } else {
                         throw new Error("Unknown entry desc: " + obfEntry.getClass().getName());
diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
index e8bda8ef..820ecbbf 100644
--- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
@@ -363,6 +363,11 @@ public class JarIndex {
         }
 
         public Set<MethodEntry> getRelatedMethodImplementations(MethodEntry obfMethodEntry) {
+                AccessFlags flags = getAccessFlags(obfMethodEntry);
+                if (flags.isPrivate() || flags.isStatic()) {
+                        return Collections.singleton(obfMethodEntry);
+                }
+
                 Set<MethodEntry> methodEntries = Sets.newHashSet();
                 getRelatedMethodImplementations(methodEntries, getMethodInheritance(new DirectionalTranslator(entryPool), obfMethodEntry));
                 return methodEntries;
@@ -375,8 +380,11 @@ public class JarIndex {
                 }
 
                 if (containsObfMethod(methodEntry)) {
-                        // collect the entry
-                        methodEntries.add(methodEntry);
+                        AccessFlags flags = getAccessFlags(methodEntry);
+                        if (!flags.isPrivate() && !flags.isStatic()) {
+                                // collect the entry
+                                methodEntries.add(methodEntry);
+                        }
                 }
 
                 // look at bridge methods!
@@ -400,8 +408,11 @@ public class JarIndex {
         private void getRelatedMethodImplementations(Set<MethodEntry> methodEntries, MethodImplementationsTreeNode node) {
                 MethodEntry methodEntry = node.getMethodEntry();
                 if (containsObfMethod(methodEntry)) {
-                        // collect the entry
-                        methodEntries.add(methodEntry);
+                        AccessFlags flags = getAccessFlags(methodEntry);
+                        if (!flags.isPrivate() && !flags.isStatic()) {
+                                // collect the entry
+                                methodEntries.add(methodEntry);
+                        }
                 }
 
                 // look at bridge methods!