Merge remote-tracking branch 'origin/master' into future/nms

build.gradle

@@ -11,7 +11,7 @@ plugins {
 
 allprojects {
     group 'me.William278'
-    version '1.2'
+    version '1.2.2'
 
     compileJava { options.encoding = 'UTF-8' }
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }

bukkit/build.gradle

@@ -3,7 +3,7 @@ dependencies {
     compileOnly project(':api')
     implementation project(path: ':common', configuration: 'shadow')
 
-    compileOnly 'redis.clients:jedis:3.7.0'
+    compileOnly 'redis.clients:jedis:3.7.1'
     implementation 'org.bstats:bstats-bukkit:2.2.1'
     implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
 

bungeecord/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     compileOnly project(':common')
     implementation project(path: ':common', configuration: 'shadow')
 
-    compileOnly 'redis.clients:jedis:3.7.0'
+    compileOnly 'redis.clients:jedis:3.7.1'
     implementation 'org.bstats:bstats-bungeecord:2.2.1'
     implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
     implementation 'net.byteflux:libby-bungee:1.1.5'

bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java

@@ -156,7 +156,7 @@ public final class HuskSyncBungeeCord extends Plugin {
         Library mySqlLib = Library.builder()
                 .groupId("mysql")
                 .artifactId("mysql-connector-java")
-                .version("8.0.25")
+                .version("8.0.27")
                 .build();
 
         Library sqLiteLib = Library.builder()

common/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation 'redis.clients:jedis:3.7.0'
+    implementation 'redis.clients:jedis:3.7.1'
     implementation 'com.zaxxer:HikariCP:5.0.0'
 }
 

common/src/main/java/me/william278/husksync/proxy/data/DataManager.java

@@ -341,8 +341,9 @@ public class DataManager {
             // Remove the old data if it exists
             PlayerData oldData = null;
             for (PlayerData data : playerData) {
-                if (data.getPlayerUUID() == newData.getPlayerUUID()) {
+                if (data.getPlayerUUID().equals(newData.getPlayerUUID())) {
                     oldData = data;
+                    break;
                 }
             }
             if (oldData != null) {
@@ -361,7 +362,7 @@ public class DataManager {
          */
         public PlayerData getPlayer(UUID playerUUID) {
             for (PlayerData data : playerData) {
-                if (data.getPlayerUUID() == playerUUID) {
+                if (data.getPlayerUUID().equals(playerUUID)) {
                     return data;
                 }
             }

common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java

@@ -77,6 +77,9 @@ public class MySQL extends Database {
         dataSource.setUsername(username);
         dataSource.setPassword(password);
 
+        // Set data source driver path
+        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+
         // Set various additional parameters
         dataSource.setMaximumPoolSize(hikariMaximumPoolSize);
         dataSource.setMinimumIdle(hikariMinimumIdle);

common/src/main/java/me/william278/husksync/redis/RedisListener.java

@@ -2,6 +2,7 @@ package me.william278.husksync.redis;
 
 import me.william278.husksync.Settings;
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.JedisPubSub;
 import redis.clients.jedis.exceptions.JedisException;
 
@@ -17,13 +18,15 @@ public abstract class RedisListener {
 
     /**
      * Handle an incoming {@link RedisMessage}
+     *
      * @param message The {@link RedisMessage} to handle
      */
     public abstract void handleMessage(RedisMessage message);
 
     /**
      * Log to console
-     * @param level The {@link Level} to log
+     *
+     * @param level   The {@link Level} to log
      * @param message Message to log
      */
     public abstract void log(Level level, String message);
@@ -32,15 +35,15 @@ public abstract class RedisListener {
      * Start the Redis listener
      */
     public final void listen() {
-        try(Jedis jedis = new Jedis(Settings.redisHost, Settings.redisPort)) {
+        try (Jedis jedis = new Jedis(Settings.redisHost, Settings.redisPort)) {
             final String jedisPassword = Settings.redisPassword;
-            if (!jedisPassword.equals("")) {
-                jedis.auth(jedisPassword);
-            }
             jedis.connect();
             if (jedis.isConnected()) {
+                if (!jedisPassword.equals("")) {
+                    jedis.auth(jedisPassword);
+                }
                 isActiveAndEnabled = true;
-                log(Level.INFO,"Enabled Redis listener successfully!");
+                log(Level.INFO, "Enabled Redis listener successfully!");
                 new Thread(() -> jedis.subscribe(new JedisPubSub() {
                     @Override
                     public void onMessage(String channel, String message) {

common/src/main/java/me/william278/husksync/redis/RedisMessage.java

@@ -63,10 +63,10 @@ public class RedisMessage {
     public void send() throws IOException {
             try (Jedis publisher = new Jedis(Settings.redisHost, Settings.redisPort)) {
                 final String jedisPassword = Settings.redisPassword;
+                publisher.connect();
                 if (!jedisPassword.equals("")) {
                     publisher.auth(jedisPassword);
                 }
-                publisher.connect();
                 publisher.publish(REDIS_CHANNEL, getFullMessage());
             }
     }

velocity/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     compileOnly project(':common')
     implementation project(path: ':common', configuration: 'shadow')
 
-    compileOnly 'redis.clients:jedis:3.7.0'
+    compileOnly 'redis.clients:jedis:3.7.1'
     implementation 'org.bstats:bstats-velocity:2.2.1'
     implementation 'de.themoep:minedown-adventure:1.7.1-SNAPSHOT'
     implementation 'net.byteflux:libby-velocity:1.1.5'

velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java

@@ -43,7 +43,7 @@ import static me.william278.husksync.HuskSyncVelocity.VERSION;
 public class HuskSyncVelocity {
 
     // Plugin version
-    public static final String VERSION = "1.2";
+    public static final String VERSION = "1.2.2";
 
     // Velocity bStats ID (different from Bukkit and BungeeCord)
     private static final int METRICS_ID = 13489;
@@ -208,7 +208,7 @@ public class HuskSyncVelocity {
         Library mySqlLib = Library.builder()
                 .groupId("mysql")
                 .artifactId("mysql-connector-java")
-                .version("8.0.25")
+                .version("8.0.27")
                 .build();
 
         Library sqLiteLib = Library.builder()