From 0e1e65c7f78b99d040fa550e22f9b0c0d0c31ffc Mon Sep 17 00:00:00 2001
From: Sattera <wujiaxin752@icloud.com>
Date: Tue, 28 Mar 2023 08:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=20/cp=20=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E7=9A=84=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        | 18 +++++++++---------
 .../changepassword/ChangePasswordCommand.java  |  7 -------
 .../xephi/authme/listener/PlayerListener.java  |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 230fd9f1..92a99432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -654,7 +654,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.1</version> <!-- Log4J version bundled in 1.12.2 -->
+            <version>2.20.0</version> <!-- Log4J version bundled in 1.12.2 -->
             <scope>provided</scope>
         </dependency>
 
@@ -662,7 +662,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version> <!-- Latest java 8 release -->
+            <version>5.0.1</version> <!-- Latest java 8 release -->
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -675,7 +675,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
+            <version>2.0.5</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
             <optional>true</optional>
         </dependency>
 
@@ -691,13 +691,13 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.31</version>
+            <version>8.0.32</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.0.8</version>
+            <version>3.1.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -980,7 +980,7 @@
         <dependency>
             <groupId>at.favre.lib</groupId>
             <artifactId>bcrypt</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -1002,7 +1002,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.0</version>
+            <version>42.5.4</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1032,7 +1032,7 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
-            <version>4.8.1</version>
+            <version>5.2.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>hamcrest-core</artifactId>
@@ -1045,7 +1045,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.26.0</version>
+            <version>3.32.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
index 72ff55bc..274bd3ff 100644
--- a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
@@ -43,13 +43,6 @@ public class ChangePasswordCommand extends PlayerCommand {
             return;
         }
 
-        // Check if the user has been verified or not
-        if (codeManager.isVerificationRequired(player)) {
-            codeManager.codeExistOrGenerateNew(name);
-            commonService.send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
-            return;
-        }
-
         String oldPassword = arguments.get(0);
         String newPassword = arguments.get(1);
 
diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java
index 17522ad3..b8173056 100644
--- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java
@@ -514,7 +514,7 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.LOWEST)
     public void onSwitchHand(PlayerSwapHandItemsEvent event) {
         Player player = event.getPlayer();
-        if (!player.hasPermission("keybindings.use") || !player.isSneaking())
+        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
             return;
         event.setCancelled(true);
         Bukkit.dispatchCommand(event.getPlayer(), "help");