Improve MethodHandle API PR for ACFBukkitLocalesListener

Author: chickeneer

bukkit/src/main/java/co/aikar/commands/ACFBukkitLocalesListener.java

@@ -31,14 +31,13 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Locale;
 
 class ACFBukkitLocalesListener implements Listener {
 
     private final BukkitCommandManager manager;
     private MethodHandle localeMethod1_8 = null;
+    private boolean checkedLocaleMethod1_8 = false;
 
     ACFBukkitLocalesListener(BukkitCommandManager manager) {
         this.manager = manager;
@@ -60,24 +59,20 @@ void onLocaleChange(PlayerLocaleChangeEvent event) {
                 }
             } catch (NoSuchMethodError ignored2) {
                 try {
+                    if (!checkedLocaleMethod1_8) {
+                        checkedLocaleMethod1_8 = true;
+                        MethodHandles.Lookup lookup = MethodHandles.lookup();
+                        MethodType type = MethodType.methodType(String.class);
+                        localeMethod1_8 = lookup.findVirtual(PlayerLocaleChangeEvent.class, "getNewLocale", type);
+                    }
                     if (localeMethod1_8 != null) {
                         String value = (String) localeMethod1_8.invoke(event);
                         if (!value.equals(manager.issuersLocaleString.get(player.getUniqueId()))) {
                             locale = ACFBukkitUtil.stringToLocale(value);
                         }
-
-                        return;
-                    }
-
-                    MethodHandles.Lookup lookup = MethodHandles.lookup();
-                    MethodType type = MethodType.methodType(String.class);
-
-                    localeMethod1_8 = lookup.findVirtual(PlayerLocaleChangeEvent.class, "getNewLocale", type);
-                    String value = (String) localeMethod1_8.invoke(event);
-                    if (!value.equals(manager.issuersLocaleString.get(player.getUniqueId()))) {
-                        locale = ACFBukkitUtil.stringToLocale(value);
                     }
-                } catch (Throwable ignored3) {
+                } catch (Throwable t) {
+                    manager.log(LogLevel.ERROR, "Error registering MethodHandle for LocaleChangeEvent", t);
                 }
             }
         }