Fix NPE

添加一个依赖库支持

README.md

@@ -16,4 +16,5 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
  10. Player login logic improvement to reduce lag
  11. Automatically purge bot data
  12. Folia compatibility [Here](https://github.com/HaHaWTH/AuthMeReReloaded/releases/download/b20/AuthMe-5.6.0-FORK-Folia.jar)
- 13. More...... 
+ 13. Offhand Menu compatibility(Thats amazing)
+ 14. More......

pom.xml

@@ -608,6 +608,16 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>jitpack</id>
+            <url>https://jitpack.io/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <dependencies>

src/main/java/fr/xephi/authme/AuthMe.java

@@ -75,7 +75,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "24";
+    private static String pluginBuildNumber = "25";
     protected final Boolean SHAEnabled = false;
     // Private instances
     private EmailService emailService;
@@ -325,13 +325,15 @@ public class AuthMe extends JavaPlugin {
         // Try to register 1.8+ player listeners
         if (isClassLoaded("org.bukkit.event.entity.EntityPickupItemEvent") && isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")){
             pluginManager.registerEvents(injector.getSingleton(PlayerListenerHigherThan18.class), this);
-        }
-
-        // Try to register 1.9 player listeners
-        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+        } else if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
         }
 
+        // Try to register 1.9 player listeners(Moved to else-if)
+//        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+//            pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
+//        }
+
         // Try to register 1.9 spigot player listeners
         if (isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19Spigot.class), this);

src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java

@@ -61,7 +61,7 @@ public class GuiCaptchaHandler implements Listener {
     public void onInventoryClick(InventoryClickEvent event) {
         if (event.getWhoClicked() instanceof Player) {
             Player player = (Player) event.getWhoClicked();
-            // 获取点击事件的容器
+            ItemStack currentItem = event.getCurrentItem();
             if (!authmeApi.isRegistered(player.getName()) && !closeReasonMap.containsKey(player)) {
                 if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getWhoClicked().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
                     if (!closeReasonMap.containsKey(player)) {
@@ -70,8 +70,7 @@ public class GuiCaptchaHandler implements Listener {
                     }
                     return;
                 }
-                /* Line 74 may throw NullPointerException, we can't solve it for now.*/
-                if (Objects.requireNonNull(event.getCurrentItem()).getType().equals(Material.REDSTONE_BLOCK)) {
+                if (currentItem!=null && currentItem.getType().equals(Material.REDSTONE_BLOCK)){
                     event.setCancelled(true);
                     closeReasonMap.put(player, "verified");
                     player.closeInventory();

src/main/java/fr/xephi/authme/security/crypts/Whirlpool.java

@@ -308,7 +308,7 @@ public class Whirlpool extends UnsaltedMethod {
         if (bufferRem + sourceBits < 8) {
             // all remaining data fits on buffer[bufferPos], and there still
             // remains some space.
-            bufferBits += sourceBits;
+            bufferBits += (int) sourceBits;
         } else {
             // buffer[bufferPos] is full:
             bufferPos++;

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b24
+version: 5.6.0-FORK-b25
 api-version: 1.13
 softdepend:
     - Vault