Registration for 'itself' - log as such.

NoCheatPlus · May 4, 2017 · 4522bc0 · 4522bc0
1 parent b62f310
commit 4522bc0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...n/java/fr/neatmonster/nocheatplus/components/registry/DefaultGenericInstanceRegistry.java b/...n/java/fr/neatmonster/nocheatplus/components/registry/DefaultGenericInstanceRegistry.java
@@ -217,14 +217,18 @@ public <T> T registerGenericInstance(T instance) {
     @Override
     public <T, TI extends T> T registerGenericInstance(Class<T> registerFor, TI instance) {
         Registration<T> registration = getRegistration(registerFor, true);
-        T registered = registration.registerInstance(instance);
-        if (registered != null) {
-            logRegistryEvent("Registered (override) for " + registerFor.getName() + ": " + instance.getClass().getName());
+        T previouslyRegistered = registration.registerInstance(instance);
+        String msg = previouslyRegistered == null ? "Registered for " : "Registered (override) for ";
+        String registerForName = registerFor.getName();
+        String instanceName = instance.getClass().getName();
+        if (registerForName.equals(instanceName)) {
+            msg += "itself: " + instanceName;
         }
         else {
-            logRegistryEvent("Registered for " + registerFor.getName() + ": " + instance.getClass().getName());
+            msg += registerForName + ": " + instanceName;
         }
-        return registered;
+        logRegistryEvent(msg);
+        return previouslyRegistered;
     }
 
     @Override