Merge pull request #9 from v4Guard/develop

v4Guard Plugin v1.1.1c
v4Guard · Aug 27, 2022 · 61815c4 · 61815c4
2 parents 421974f + 4ab8f7d
commit 61815c4
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.v4guard</groupId>
     <artifactId>v4guard-plugin</artifactId>
-    <version>1.1.1b</version>
+    <version>1.1.1c</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/src/main/java/io/v4guard/plugin/bungee/BungeeCheckProcessor.java b/src/main/java/io/v4guard/plugin/bungee/BungeeCheckProcessor.java
@@ -25,7 +25,7 @@ public void onPreLogin(String username, Object event) {
         String address = e.getConnection().getAddress().getAddress().getHostAddress();
         v4GuardBungee.getCoreInstance().getCheckManager().cleanupChecks(username);
 
-        final boolean wait = (boolean) v4GuardBungee.getCoreInstance().getBackendConnector().getSettings().get("waitResponse");
+        final boolean wait = (boolean) v4GuardBungee.getCoreInstance().getBackendConnector().getSettings().getOrDefault("waitResponse", false);
         if (wait) {
             e.registerIntent(v4GuardBungee.getV4Guard());
         }

diff --git a/src/main/java/io/v4guard/plugin/bungee/v4GuardBungee.java b/src/main/java/io/v4guard/plugin/bungee/v4GuardBungee.java
@@ -16,7 +16,11 @@ public class v4GuardBungee extends Plugin {
     @Override
     public void onEnable(){
         this.getProxy().getConsole().sendMessage("§e[v4guard-plugin] (Bungee) Enabling...");
-        new Metrics(this, 16219);
+        try {
+            new Metrics(this, 16219);
+        } catch (Exception ex){
+            this.getProxy().getConsole().sendMessage("§e[v4guard-plugin] (Bungee) Failed to connect with bStats [WARN]");
+        }
         try {
             core = new v4GuardCore(v4GuardMode.BUNGEE);
             core.getCheckManager().addProcessor(new BungeeCheckProcessor());

diff --git a/src/main/java/io/v4guard/plugin/core/v4GuardCore.java b/src/main/java/io/v4guard/plugin/core/v4GuardCore.java
@@ -20,7 +20,7 @@ public class v4GuardCore {
     private BackendConnector backendConnector;
     private CheckManager checkManager;
 
-    public static final String pluginVersion = "1.1.1b";
+    public static final String pluginVersion = "1.1.1c";
 
     private boolean debug = false;
     private v4GuardMode pluginMode = v4GuardMode.UNKNOWN;

diff --git a/src/main/java/io/v4guard/plugin/spigot/SpigotCheckProcessor.java b/src/main/java/io/v4guard/plugin/spigot/SpigotCheckProcessor.java
@@ -26,7 +26,7 @@ public void onPreLogin(String username, Object event) {
         String address = e.getAddress().getHostAddress();
         v4GuardSpigot.getCoreInstance().getCheckManager().cleanupChecks(username);
 
-        final boolean wait = (boolean) v4GuardSpigot.getCoreInstance().getBackendConnector().getSettings().get("waitResponse");
+        final boolean wait = (boolean) v4GuardSpigot.getCoreInstance().getBackendConnector().getSettings().getOrDefault("waitResponse", false);;
         new CompletableNameCheckTask(e.getName()) {
             @Override
             public void complete(boolean nameIsValid) {
@@ -56,7 +56,7 @@ public void run() {
                     if (player == null) {
                         return;
                     }
-                    Document kickMessages = (Document) v4GuardSpigot.getCoreInstance().getBackendConnector().getSettings().get("messages");
+                    Document kickMessages = (Document) v4GuardSpigot.getCoreInstance().getBackendConnector().getSettings().getOrDefault("waitResponse", false);;
                     String message= StringUtils.buildMultilineString((List<String>) kickMessages.get("invalidUsername"));
                     message = StringUtils.replacePlaceholders(message, new Document("username", e.getName()));
                     player.kickPlayer(ChatColor.translateAlternateColorCodes('&', message));

diff --git a/src/main/java/io/v4guard/plugin/spigot/v4GuardSpigot.java b/src/main/java/io/v4guard/plugin/spigot/v4GuardSpigot.java
@@ -19,6 +19,10 @@ public void onEnable(){
         this.getServer().getConsoleSender().sendMessage("§e[v4guard-plugin] (Spigot) Enabling...");
         try {
             new Metrics(this, 16218);
+        } catch (Exception ex){
+            this.getServer().getConsoleSender().sendMessage("§e[v4guard-plugin] (Spigot) Failed to connect with bStats [WARN]");
+        }
+        try {
             core = new v4GuardCore(v4GuardMode.SPIGOT);
             core.getCheckManager().addProcessor(new SpigotCheckProcessor());
         } catch (Exception e) {

diff --git a/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java b/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java
@@ -25,7 +25,7 @@ public void onPreLoginWithContinuation(Object event, Continuation continuation)
         String address = e.getConnection().getRemoteAddress().getAddress().getHostAddress();
         v4GuardVelocity.getCoreInstance().getCheckManager().cleanupChecks(e.getUsername());
 
-        final boolean wait = (boolean) v4GuardVelocity.getCoreInstance().getBackendConnector().getSettings().get("waitResponse");
+        final boolean wait = (boolean) v4GuardVelocity.getCoreInstance().getBackendConnector().getSettings().getOrDefault("waitResponse", false);;
         if (!wait) {
             if(continuation != null) continuation.resume();
             return;
@@ -41,7 +41,7 @@ public void onPreLogin(String username, Object event) {
         String address = e.getConnection().getRemoteAddress().getAddress().getHostAddress();
         v4GuardVelocity.getCoreInstance().getCheckManager().cleanupChecks(e.getUsername());
 
-        final boolean wait = (boolean) v4GuardVelocity.getCoreInstance().getBackendConnector().getSettings().get("waitResponse");
+        final boolean wait = (boolean) v4GuardVelocity.getCoreInstance().getBackendConnector().getSettings().getOrDefault("waitResponse", false);;
         if(wait) return;
         doChecks(e, null);
     }

diff --git a/src/main/java/io/v4guard/plugin/velocity/v4GuardVelocity.java b/src/main/java/io/v4guard/plugin/velocity/v4GuardVelocity.java
@@ -39,7 +39,11 @@ public v4GuardVelocity(ProxyServer server, Logger logger, Metrics.Factory metric
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent event) {
         server.getConsoleCommandSource().sendMessage(Component.text("§e[v4guard-plugin] (Velocity) Enabling..."));
-        metricsFactory.make(this, 16220);
+        try {
+            metricsFactory.make(this, 16220);
+        } catch (Exception ex) {
+            server.getConsoleCommandSource().sendMessage(Component.text("§e[v4guard-plugin] (Velocity) Failed to connect with bStats [WARN]"));
+        }
         try {
             core = new v4GuardCore(v4GuardMode.VELOCITY);
             core.getCheckManager().addProcessor(new VelocityCheckProcessor());