diff --git a/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java b/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java index d587ada7..2dbefb50 100644 --- a/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java +++ b/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java @@ -122,11 +122,6 @@ public final class HuskSyncBukkit extends JavaPlugin { // Initialize the redis listener redisListener = new BukkitRedisListener(); - if (!redisListener.isActiveAndEnabled) { - getPluginLoader().disablePlugin(this); - getLogger().severe("Failed to initialize Redis; disabling HuskSync (" + getServer().getName() + ") v" + getDescription().getVersion()); - return; - } // Ensure redis is connected; establish a handshake establishRedisHandshake(); diff --git a/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java b/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java index 2e0bc688..095c226a 100644 --- a/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java +++ b/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java @@ -101,10 +101,6 @@ public final class HuskSyncBungeeCord extends Plugin { // Initialize the redis listener redisListener = new BungeeRedisListener(); - if (!redisListener.isActiveAndEnabled) { - getBungeeLogger().severe("Failed to initialize Redis; HuskSync will now abort loading itself (" + getProxy().getName() + ") v" + getDescription().getVersion()); - return; - } // Register listener getProxy().getPluginManager().registerListener(this, new BungeeEventListener()); diff --git a/common/src/main/java/me/william278/husksync/redis/RedisListener.java b/common/src/main/java/me/william278/husksync/redis/RedisListener.java index 823195ec..e12a82c4 100644 --- a/common/src/main/java/me/william278/husksync/redis/RedisListener.java +++ b/common/src/main/java/me/william278/husksync/redis/RedisListener.java @@ -72,7 +72,10 @@ public abstract class RedisListener { log(Level.INFO, "Enabled Redis listener successfully!"); } else { isActiveAndEnabled = false; - log(Level.SEVERE, "Connection to the Redis server could not be established, please check the credentials."); + log(Level.SEVERE, """ + Failed to establish connection to the Redis server. + HuskSync will now abort initialization. + Please check the credentials are correct and restart your server."""); return; } jedis.subscribe(new JedisPubSub() { diff --git a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java b/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java index b2526008..e243e55a 100644 --- a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java +++ b/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java @@ -149,10 +149,6 @@ public class HuskSyncVelocity { // Initialize the redis listener redisListener = new VelocityRedisListener(); - if (!redisListener.isActiveAndEnabled) { - getVelocityLogger().severe("Failed to initialize Redis; HuskSync will now abort loading itself (Velocity) v" + VERSION); - return; - } // Register listener server.getEventManager().register(this, new VelocityEventListener());