From 94eab672cd4c1582de9359067a7bd0ed2cbc8670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 12:53:02 +0200 Subject: [PATCH 1/7] update (all modes): addition of a kick listener --- .../plugin/bungee/BungeeCheckProcessor.java | 8 ++++++ .../plugin/core/check/CheckProcessor.java | 1 + .../plugin/core/socket/BackendConnector.java | 1 + .../core/socket/listener/KickListener.java | 26 +++++++++++++++++++ .../plugin/spigot/SpigotCheckProcessor.java | 8 ++++++ .../velocity/VelocityCheckProcessor.java | 8 ++++++ 6 files changed, 52 insertions(+) create mode 100644 src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java diff --git a/src/main/java/io/v4guard/plugin/bungee/BungeeCheckProcessor.java b/src/main/java/io/v4guard/plugin/bungee/BungeeCheckProcessor.java index f4b8038..1f98aba 100644 --- a/src/main/java/io/v4guard/plugin/bungee/BungeeCheckProcessor.java +++ b/src/main/java/io/v4guard/plugin/bungee/BungeeCheckProcessor.java @@ -84,4 +84,12 @@ public boolean onExpire(VPNCheck check) { } return false; } + + @Override + public void kickPlayer(String username, String reason){ + ProxiedPlayer player = ProxyServer.getInstance().getPlayer(username); + if (player != null) { + player.disconnect(TextComponent.fromLegacyText(reason)); + } + } } diff --git a/src/main/java/io/v4guard/plugin/core/check/CheckProcessor.java b/src/main/java/io/v4guard/plugin/core/check/CheckProcessor.java index 51c725f..f9a8357 100644 --- a/src/main/java/io/v4guard/plugin/core/check/CheckProcessor.java +++ b/src/main/java/io/v4guard/plugin/core/check/CheckProcessor.java @@ -7,4 +7,5 @@ public interface CheckProcessor { void onPreLogin(String username, K event); void onPostLogin(String username, K event); boolean onExpire(VPNCheck VPNCheck); + void kickPlayer(String username, String reason); } diff --git a/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java b/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java index 827d7a7..b0768a5 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java +++ b/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java @@ -79,6 +79,7 @@ public void handleEvents() { //registerListener("ipset", new IPSetListener(this)); registerListener("check", new CheckListener()); registerListener("message", new MessageListener(this)); + registerListener("kick", new KickListener()); } public void registerListener(String event, Emitter.Listener listener){ diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java new file mode 100644 index 0000000..ff6967c --- /dev/null +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java @@ -0,0 +1,26 @@ +package io.v4guard.plugin.core.socket.listener; + +import io.socket.emitter.Emitter; +import io.v4guard.plugin.core.check.CheckProcessor; +import io.v4guard.plugin.core.v4GuardCore; +import org.bson.Document; + +import java.util.List; + +public class KickListener implements Emitter.Listener { + + @Override + public void call(Object... args) { + Document doc = Document.parse(args[0].toString()); + String username = doc.getString("username"); + List reason = doc.get("message", List.class); + String formattedReason = "", sep = ""; + for (String s : reason) { + formattedReason += sep + s; + sep = "\\n"; + } + for(CheckProcessor cp : v4GuardCore.getInstance().getCheckManager().getProcessors()){ + cp.kickPlayer(username, formattedReason); + } + } +} diff --git a/src/main/java/io/v4guard/plugin/spigot/SpigotCheckProcessor.java b/src/main/java/io/v4guard/plugin/spigot/SpigotCheckProcessor.java index 3fa5538..90ae7c7 100644 --- a/src/main/java/io/v4guard/plugin/spigot/SpigotCheckProcessor.java +++ b/src/main/java/io/v4guard/plugin/spigot/SpigotCheckProcessor.java @@ -95,4 +95,12 @@ public void run() { } return false; } + + @Override + public void kickPlayer(String username, String reason){ + Player player = Bukkit.getPlayer(username); + if (player != null) { + player.kickPlayer(reason); + } + } } diff --git a/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java b/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java index f29d549..c6ca3c8 100644 --- a/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java +++ b/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java @@ -68,6 +68,14 @@ public boolean onExpire(VPNCheck status) { return false; } + @Override + public void kickPlayer(String username, String reason){ + Optional pp = v4GuardVelocity.getV4Guard().getServer().getPlayer(username); + if(pp.isPresent()) { + pp.get().disconnect(Component.text(reason)); + } + } + private void doChecks(PreLoginEvent e, Continuation continuation) { new CompletableNameCheckTask(e.getUsername()) { @Override From 0f6259e6fde59d2cab508f690ef2d5d79ac73b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 13:01:05 +0200 Subject: [PATCH 2/7] update (all modes): addition of an option to send messages to a specific player --- .../plugin/bungee/messager/Messager.java | 7 ++++++ .../plugin/core/socket/BackendConnector.java | 10 ++++++++ .../core/socket/listener/AuthListener.java | 16 ++++++++---- .../core/socket/listener/MessageListener.java | 25 ++++++++++++++++--- .../plugin/spigot/messager/Messager.java | 7 ++++++ .../plugin/velocity/messager/Messager.java | 10 +++++++- 6 files changed, 65 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java b/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java index 0a88717..0fbd5da 100644 --- a/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java +++ b/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java @@ -20,4 +20,11 @@ public void broadcastWithPermission(String message, String permission){ } } + public void sendToPlayer(String message, String username){ + ProxiedPlayer player = ProxyServer.getInstance().getPlayer(username); + if(player != null){ + player.sendMessage(new ComponentBuilder(message).create()); + } + } + } diff --git a/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java b/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java index b0768a5..86890e9 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java +++ b/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java @@ -21,12 +21,14 @@ import java.util.stream.Stream; public class BackendConnector { + private Socket socket; private IO.Options options; private SocketStatus socketStatus = SocketStatus.DISCONNECTED; private final Runtime runtime = Runtime.getRuntime(); private HashMap settings; private boolean reconnected = false; + private String authCode; private HashMap registeredListeners = new HashMap<>(); @@ -130,6 +132,14 @@ public void setReconnected(boolean reconnected) { this.reconnected = reconnected; } + public String getAuthCode() { + return authCode; + } + + public void setAuthCode(String authCode) { + this.authCode = authCode; + } + public Runtime getRuntime() { return runtime; } diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java index d636749..986b52d 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java @@ -1,10 +1,10 @@ package io.v4guard.plugin.core.socket.listener; -import io.v4guard.plugin.core.v4GuardCore; -import io.v4guard.plugin.core.socket.BackendConnector; -import io.v4guard.plugin.core.socket.SocketStatus; import io.socket.client.IO; import io.socket.emitter.Emitter; +import io.v4guard.plugin.core.socket.BackendConnector; +import io.v4guard.plugin.core.socket.SocketStatus; +import io.v4guard.plugin.core.v4GuardCore; import org.bson.Document; import java.io.File; @@ -14,8 +14,8 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.Collections; +import java.util.Timer; import java.util.logging.Level; -import java.util.logging.Logger; public class AuthListener implements Emitter.Listener { @@ -28,10 +28,16 @@ public AuthListener(BackendConnector backendConnector) { @Override public void call(Object... args) { Document doc = Document.parse(args[0].toString()); + backendConnector.setAuthCode(doc.getString("code")); try { backendConnector.setSocketStatus(SocketStatus.valueOf(doc.getString("status"))); if (backendConnector.getSocketStatus().equals(SocketStatus.NOT_AUTHENTICATED)) { - v4GuardCore.getInstance().getLogger().log(Level.WARNING,"This instance is not connected with your account. Connect it using this link: https://dashboard.v4guard.io/link/" + doc.getString("code")); + new Timer().schedule(new java.util.TimerTask() { + @Override + public void run() { + v4GuardCore.getInstance().getLogger().log(Level.WARNING,"This instance is not connected with your account. Connect it using this link: https://dashboard.v4guard.io/link/" + backendConnector.getAuthCode()); + } + }, 1000L, 60L*1000L); } else if (backendConnector.getSocketStatus().equals(SocketStatus.PRE_AUTHENTICATED)) { File secrets; if (!v4GuardCore.getInstance().getDataFolder().exists()) { diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java index 326b38d..2184863 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java @@ -1,12 +1,16 @@ package io.v4guard.plugin.core.socket.listener; +import io.socket.emitter.Emitter; import io.v4guard.plugin.bungee.v4GuardBungee; import io.v4guard.plugin.core.socket.BackendConnector; import io.v4guard.plugin.core.v4GuardCore; import io.v4guard.plugin.spigot.v4GuardSpigot; -import io.socket.emitter.Emitter; +import io.v4guard.plugin.velocity.v4GuardVelocity; import org.bson.Document; +import java.util.ArrayList; +import java.util.List; + public class MessageListener implements Emitter.Listener { BackendConnector backendConnector; @@ -19,14 +23,27 @@ public MessageListener(BackendConnector backendConnector) { public void call(Object... args) { Document doc = Document.parse(args[0].toString()); String permission = doc.getOrDefault("permission", "*").toString(); + List players = (List) doc.getOrDefault("players", new ArrayList<>()); + String message = (String) doc.getOrDefault("message", "Disconnected"); switch (v4GuardCore.getInstance().getPluginMode()){ case BUNGEE: - v4GuardBungee.getV4Guard().getMessager().broadcastWithPermission(doc.getString("message"), permission); + v4GuardBungee.getV4Guard().getMessager().broadcastWithPermission(message, permission); + for(String player : players){ + v4GuardBungee.getV4Guard().getMessager().sendToPlayer(message, player); + } break; case SPIGOT: - v4GuardSpigot.getV4Guard().getMessager().broadcastWithPermission(doc.getString("message"), permission); + for(String player : players){ + v4GuardSpigot.getV4Guard().getMessager().sendToPlayer(message, player); + } + v4GuardSpigot.getV4Guard().getMessager().broadcastWithPermission(message, permission); + break; + case VELOCITY: + for(String player : players){ + v4GuardVelocity.getV4Guard().getMessager().sendToPlayer(message, player); + } + v4GuardVelocity.getV4Guard().getMessager().broadcastWithPermission(message, permission); break; - } } diff --git a/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java b/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java index 8ac84a4..fd975dc 100644 --- a/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java +++ b/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java @@ -19,4 +19,11 @@ public static void broadcastWithPermission(String message, String permission){ } } + public void sendToPlayer(String message, String username){ + Player player = Bukkit.getServer().getPlayer(username); + if(player != null){ + player.sendMessage(message); + } + } + } diff --git a/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java b/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java index b99e30d..709d01b 100644 --- a/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java +++ b/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java @@ -2,10 +2,11 @@ import com.velocitypowered.api.proxy.Player; -import com.velocitypowered.api.proxy.ProxyServer; import io.v4guard.plugin.velocity.v4GuardVelocity; import net.kyori.adventure.text.Component; +import java.util.Optional; + public class Messager { public void broadcastWithPermission(String message, String permission){ @@ -22,4 +23,11 @@ public void broadcastWithPermission(String message, String permission){ } } + public void sendToPlayer(String message, String username){ + Optional player = v4GuardVelocity.getV4Guard().getServer().getPlayer(username); + if(player.isPresent()){ + player.get().sendMessage(Component.text(message)); + } + } + } From e214a2d3fe99973556b2eee6caf76c35d0e5f66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 13:14:24 +0200 Subject: [PATCH 3/7] fix (all modes): prevent sending multiple messages --- .../plugin/bungee/messager/Messager.java | 9 ++++++++- .../core/socket/listener/MessageListener.java | 20 +++++++++++++------ .../plugin/spigot/messager/Messager.java | 9 ++++++++- .../plugin/velocity/messager/Messager.java | 8 +++++++- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java b/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java index 0fbd5da..05ccd3e 100644 --- a/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java +++ b/src/main/java/io/v4guard/plugin/bungee/messager/Messager.java @@ -4,20 +4,27 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.connection.ProxiedPlayer; +import java.util.ArrayList; +import java.util.List; + public class Messager { - public void broadcastWithPermission(String message, String permission){ + public List broadcastWithPermission(String message, String permission){ + List broadcastedPlayers = new ArrayList<>(); if(permission.equals("*")){ for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){ player.sendMessage(new ComponentBuilder(message).create()); + broadcastedPlayers.add(player.getName()); } } else{ for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){ if(player.hasPermission(permission)){ player.sendMessage(new ComponentBuilder(message).create()); + broadcastedPlayers.add(player.getName()); } } } + return broadcastedPlayers; } public void sendToPlayer(String message, String username){ diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java index 2184863..88666c1 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/MessageListener.java @@ -26,24 +26,32 @@ public void call(Object... args) { List players = (List) doc.getOrDefault("players", new ArrayList<>()); String message = (String) doc.getOrDefault("message", "Disconnected"); switch (v4GuardCore.getInstance().getPluginMode()){ - case BUNGEE: - v4GuardBungee.getV4Guard().getMessager().broadcastWithPermission(message, permission); + case BUNGEE: { + List broadcasted = v4GuardBungee.getV4Guard().getMessager().broadcastWithPermission(message, permission); + players.removeAll(broadcasted); for(String player : players){ v4GuardBungee.getV4Guard().getMessager().sendToPlayer(message, player); } break; - case SPIGOT: + } + case SPIGOT: { + List broadcasted = v4GuardSpigot.getV4Guard().getMessager().broadcastWithPermission(message, permission); + players.removeAll(broadcasted); for(String player : players){ v4GuardSpigot.getV4Guard().getMessager().sendToPlayer(message, player); } - v4GuardSpigot.getV4Guard().getMessager().broadcastWithPermission(message, permission); break; - case VELOCITY: + } + + case VELOCITY: { + List broadcasted = v4GuardVelocity.getV4Guard().getMessager().broadcastWithPermission(message, permission); + players.removeAll(broadcasted); for(String player : players){ v4GuardVelocity.getV4Guard().getMessager().sendToPlayer(message, player); } - v4GuardVelocity.getV4Guard().getMessager().broadcastWithPermission(message, permission); break; + } + } } diff --git a/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java b/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java index fd975dc..23e224e 100644 --- a/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java +++ b/src/main/java/io/v4guard/plugin/spigot/messager/Messager.java @@ -3,20 +3,27 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import java.util.ArrayList; +import java.util.List; + public class Messager { - public static void broadcastWithPermission(String message, String permission){ + public List broadcastWithPermission(String message, String permission){ + List broadcastedPlayers = new ArrayList<>(); if(permission.equals("*")){ for(Player player : Bukkit.getServer().getOnlinePlayers()){ player.sendMessage(message); + broadcastedPlayers.add(player.getName()); } } else{ for(Player player : Bukkit.getServer().getOnlinePlayers()){ if(player.hasPermission(permission)){ player.sendMessage(message); + broadcastedPlayers.add(player.getName()); } } } + return broadcastedPlayers; } public void sendToPlayer(String message, String username){ diff --git a/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java b/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java index 709d01b..0f26286 100644 --- a/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java +++ b/src/main/java/io/v4guard/plugin/velocity/messager/Messager.java @@ -5,22 +5,28 @@ import io.v4guard.plugin.velocity.v4GuardVelocity; import net.kyori.adventure.text.Component; +import java.util.ArrayList; +import java.util.List; import java.util.Optional; public class Messager { - public void broadcastWithPermission(String message, String permission){ + public List broadcastWithPermission(String message, String permission){ + List broadcastedPlayers = new ArrayList<>(); if(permission.equals("*")){ for(Player player : v4GuardVelocity.getV4Guard().getServer().getAllPlayers()){ player.sendMessage(Component.text(message)); + broadcastedPlayers.add(player.getUsername()); } } else{ for(Player player : v4GuardVelocity.getV4Guard().getServer().getAllPlayers()){ if(player.hasPermission(permission)){ player.sendMessage(Component.text(message)); + broadcastedPlayers.add(player.getUsername()); } } } + return broadcastedPlayers; } public void sendToPlayer(String message, String username){ From 94a67dc35cc0fb1fb0ef4c67fa9dc376fd567b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 13:19:11 +0200 Subject: [PATCH 4/7] fix (core): incorrect scape symbol --- .../io/v4guard/plugin/core/socket/listener/KickListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java index ff6967c..fee8ce2 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/KickListener.java @@ -17,7 +17,7 @@ public void call(Object... args) { String formattedReason = "", sep = ""; for (String s : reason) { formattedReason += sep + s; - sep = "\\n"; + sep = "\n"; } for(CheckProcessor cp : v4GuardCore.getInstance().getCheckManager().getProcessors()){ cp.kickPlayer(username, formattedReason); From 71e231d2874648563afc5756d01c69c8bca2c916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 13:27:03 +0200 Subject: [PATCH 5/7] update (backend): addition of a console messaging listener --- .../plugin/core/socket/BackendConnector.java | 1 + .../core/socket/listener/ConsoleListener.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 src/main/java/io/v4guard/plugin/core/socket/listener/ConsoleListener.java diff --git a/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java b/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java index 86890e9..8321edd 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java +++ b/src/main/java/io/v4guard/plugin/core/socket/BackendConnector.java @@ -78,6 +78,7 @@ public void handleEvents() { registerListener("auth", new AuthListener(this)); registerListener("settings", new SettingsListener(this)); registerListener("setting", new SettingListener(this)); + registerListener("console", new ConsoleListener()); //registerListener("ipset", new IPSetListener(this)); registerListener("check", new CheckListener()); registerListener("message", new MessageListener(this)); diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/ConsoleListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/ConsoleListener.java new file mode 100644 index 0000000..864d013 --- /dev/null +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/ConsoleListener.java @@ -0,0 +1,19 @@ +package io.v4guard.plugin.core.socket.listener; + +import io.socket.emitter.Emitter; +import io.v4guard.plugin.core.v4GuardCore; +import org.bson.Document; +import java.util.logging.Level; + +public class ConsoleListener implements Emitter.Listener { + + @Override + public void call(Object... args) { + Document doc = Document.parse(args[0].toString()); + String message = (String) doc.getOrDefault("message", null); + Level lvl = Level.parse((String) doc.getOrDefault("level", "INFO")); + if(message == null) return; + v4GuardCore.getInstance().getLogger().log(lvl, message); + } + +} From 7dd5326d69531489ce95f0275b02417b2792388b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 13:31:36 +0200 Subject: [PATCH 6/7] fix (core): connection message task is not being cancelled when the instance is authenticated --- .../plugin/core/socket/listener/AuthListener.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java b/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java index 986b52d..8b8d9a3 100644 --- a/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java +++ b/src/main/java/io/v4guard/plugin/core/socket/listener/AuthListener.java @@ -35,7 +35,14 @@ public void call(Object... args) { new Timer().schedule(new java.util.TimerTask() { @Override public void run() { - v4GuardCore.getInstance().getLogger().log(Level.WARNING,"This instance is not connected with your account. Connect it using this link: https://dashboard.v4guard.io/link/" + backendConnector.getAuthCode()); + if(backendConnector.getSocketStatus().equals(SocketStatus.NOT_AUTHENTICATED)){ + v4GuardCore.getInstance().getLogger().log( + Level.WARNING, + "This instance is not connected with your account. Connect it using this link: https://dashboard.v4guard.io/link/" + + backendConnector.getAuthCode()); + } else { + cancel(); + } } }, 1000L, 60L*1000L); } else if (backendConnector.getSocketStatus().equals(SocketStatus.PRE_AUTHENTICATED)) { From e4386f784cac20d76b52a62376aa3e661994d845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Tue, 30 Aug 2022 13:35:41 +0200 Subject: [PATCH 7/7] update: preparing version for pull request 1.1.2 --- pom.xml | 2 +- src/main/java/io/v4guard/plugin/core/v4GuardCore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6447f1d..46130ba 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.v4guard v4guard-plugin - 1.1.1c + 1.1.2 jar diff --git a/src/main/java/io/v4guard/plugin/core/v4GuardCore.java b/src/main/java/io/v4guard/plugin/core/v4GuardCore.java index e13bcfc..2ead0bd 100644 --- 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.1c"; + public static final String pluginVersion = "1.1.2"; private boolean debug = false; private v4GuardMode pluginMode = v4GuardMode.UNKNOWN;