Updating workflow

- Now uploading alpha jars on workflow.
- Caching depends to make it run faster

.github/workflows/maven.yml

@@ -13,8 +13,17 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 17.0
- 
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
       - name: Compile
         run: mvn -B -Pclean install
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload AntiVPN
+        uses: actions/upload-artifact@v2
+        with:
+          name: AntiVPN
+          path: Assembly/target/Assembly-*.jar

Assembly/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.8</version>
+    <version>1.8.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Assembly</artifactId>

Assembly/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8</version>
+        <version>1.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Bukkit/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.8</version>
+    <version>1.8.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bukkit</artifactId>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.8</version>
+      <version>1.8.1</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

Bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8</version>
+        <version>1.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.8</version>
+            <version>1.8.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java

@@ -12,6 +12,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
@@ -84,6 +85,12 @@ public class BukkitListener extends VPNExecutor implements Listener {
                                 // If the countryList() size is zero, no need to check.
                                 // Running country check first
                                 if(AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
+                                        && !(AntiVPN.getInstance().getExecutor()
+                                        .isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
+                                        //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
+                                        || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer()
+                                        .getAddress().getAddress()
+                                        .getHostAddress()))
                                         // This bit of code will decide whether or not to kick the player
                                         // If it contains the code and it is set to whitelist, it will not kick as they are equal
                                         // and vise versa. However, if the contains does not match the state, it will kick.
@@ -151,4 +158,9 @@ public class BukkitListener extends VPNExecutor implements Listener {
                     AntiVPN.getInstance().checked++;
                 });
     }
+
+    @EventHandler
+    public void onQuit(PlayerQuitEvent event) {
+        AntiVPN.getInstance().getPlayerExecutor().unloadPlayer(event.getPlayer().getUniqueId());
+    }
 }

Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlayerExecutor.java

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 
 public class BukkitPlayerExecutor implements PlayerExecutor {
 
-    private final Map<UUID, BukkitPlayer> cachedPlayers = new WeakHashMap<>();
+    private final Map<UUID, BukkitPlayer> cachedPlayers = new HashMap<>();
 
     @Override
     public Optional<APIPlayer> getPlayer(String name) {
@@ -34,6 +34,11 @@ public class BukkitPlayerExecutor implements PlayerExecutor {
         return Optional.of(cachedPlayers.computeIfAbsent(player.getUniqueId(), k -> new BukkitPlayer(player)));
     }
 
+    @Override
+    public void unloadPlayer(UUID uuid) {
+        cachedPlayers.remove(uuid);
+    }
+
 
     @Override
     public List<APIPlayer> getOnlinePlayers() {

Bungee/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.8</version>
+    <version>1.8.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bungee</artifactId>
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.8</version>
+      <version>1.8.1</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

Bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8</version>
+        <version>1.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.8</version>
+            <version>1.8.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java

@@ -6,6 +6,7 @@ import dev.brighten.antivpn.api.VPNExecutor;
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
@@ -48,10 +49,6 @@ public class BungeeListener extends VPNExecutor implements Listener {
     @EventHandler
     public void onListener(final PostLoginEvent event) {
         if(event.getPlayer().hasPermission("antivpn.bypass") //Has bypass permission
-                || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
-                //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
-                || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
-                     .getHostAddress())
                 || AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
                 .anyMatch(prefix -> event.getPlayer().getName().startsWith(prefix))) return;
 
@@ -61,6 +58,10 @@ public class BungeeListener extends VPNExecutor implements Listener {
                 // If the countryList() size is zero, no need to check.
                 // Running country check first
                 if(AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
+                        && !(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
+                        //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
+                        || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
+                        .getHostAddress()))
                         // This bit of code will decide whether or not to kick the player
                         // If it contains the code and it is set to whitelist, it will not kick as they are equal
                         // and vise versa. However, if the contains does not match the state, it will kick.
@@ -127,4 +128,9 @@ public class BungeeListener extends VPNExecutor implements Listener {
             AntiVPN.getInstance().checked++;
         });
     }
+
+    @EventHandler
+    public void onLeave(PlayerDisconnectEvent event) {
+        AntiVPN.getInstance().getPlayerExecutor().unloadPlayer(event.getPlayer().getUniqueId());
+    }
 }

Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlayerExecutor.java

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 
 public class BungeePlayerExecutor implements PlayerExecutor {
 
-    private final Map<ProxiedPlayer, BungeePlayer> cachedPlayers = new WeakHashMap<>();
+    private final Map<UUID, BungeePlayer> cachedPlayers = new HashMap<>();
 
     @Override
     public Optional<APIPlayer> getPlayer(String name) {
@@ -18,7 +18,7 @@ public class BungeePlayerExecutor implements PlayerExecutor {
 
         if(player == null) return Optional.empty();
 
-        return Optional.of(cachedPlayers.computeIfAbsent(player, BungeePlayer::new));
+        return Optional.of(cachedPlayers.computeIfAbsent(player.getUniqueId(), key -> new BungeePlayer(player)));
     }
 
     @Override
@@ -27,13 +27,18 @@ public class BungeePlayerExecutor implements PlayerExecutor {
 
         if(player == null) return Optional.empty();
 
-        return Optional.of(cachedPlayers.computeIfAbsent(player, BungeePlayer::new));
+        return Optional.of(cachedPlayers.computeIfAbsent(uuid, key -> new BungeePlayer(player)));
+    }
+
+    @Override
+    public void unloadPlayer(UUID uuid) {
+        this.cachedPlayers.remove(uuid);
     }
 
     @Override
     public List<APIPlayer> getOnlinePlayers() {
         return BungeeCord.getInstance().getPlayers().stream()
-                .map(pl -> cachedPlayers.computeIfAbsent(pl, BungeePlayer::new))
+                .map(pl -> cachedPlayers.computeIfAbsent(pl.getUniqueId(), key -> new BungeePlayer(pl)))
                 .collect(Collectors.toList());
     }
 }

Common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8</version>
+        <version>1.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.27</version>
+            <version>8.0.28</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>

Common/src/main/java/dev/brighten/antivpn/api/PlayerExecutor.java

@@ -10,5 +10,7 @@ public interface PlayerExecutor {
 
     Optional<APIPlayer> getPlayer(UUID uuid);
 
+    void unloadPlayer(UUID uuid);
+
     List<APIPlayer> getOnlinePlayers();
 }

Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java

@@ -35,10 +35,16 @@ public abstract class VPNExecutor {
     public abstract void log(String log, Object... objects);
 
     public boolean isWhitelisted(UUID uuid) {
+        if(AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
+            return AntiVPN.getInstance().getDatabase().isWhitelisted(uuid);
+        }
         return whitelisted.contains(uuid);
     }
 
     public boolean isWhitelisted(String ip) {
+        if(AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
+            return AntiVPN.getInstance().getDatabase().isWhitelisted(ip);
+        }
         return whitelistedIps.contains(ip);
     }
 

Common/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java

@@ -86,8 +86,10 @@ public class MongoVPN implements VPNDatabase {
         if(whitelisted) {
             Document wdoc = new Document("setting", "whitelist");
             wdoc.put("uuid", uuid.toString());
+            AntiVPN.getInstance().getExecutor().getWhitelisted().add(uuid);
             VPNExecutor.threadExecutor.execute(() -> settingsDocument.insertOne(wdoc));
         } else {
+            AntiVPN.getInstance().getExecutor().getWhitelisted().remove(uuid);
             VPNExecutor.threadExecutor.execute(() -> settingsDocument.deleteMany(Filters
                     .and(
                             Filters.eq("setting", "whitelist"),
@@ -100,8 +102,10 @@ public class MongoVPN implements VPNDatabase {
         if(whitelisted) {
             Document wdoc = new Document("setting", "whitelist");
             wdoc.put("ip", ip);
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps().add(ip);
             VPNExecutor.threadExecutor.execute(() -> settingsDocument.insertOne(wdoc));
         } else {
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps().remove(ip);
             VPNExecutor.threadExecutor.execute(() -> settingsDocument.deleteMany(Filters
                     .and(
                             Filters.eq("setting", "whitelist"),

Velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8</version>
+        <version>1.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.8</version>
+            <version>1.8.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java

@@ -1,5 +1,6 @@
 package dev.brighten.antivpn.velocity;
 
+import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.LoginEvent;
 import com.velocitypowered.api.scheduler.ScheduledTask;
 import dev.brighten.antivpn.AntiVPN;
@@ -20,105 +21,113 @@ public class VelocityListener extends VPNExecutor {
         VelocityPlugin.INSTANCE.getServer().getEventManager()
                 .register(VelocityPlugin.INSTANCE, this);
 
+        VelocityPlugin.INSTANCE.getServer().getEventManager().register(VelocityPlugin.INSTANCE, DisconnectEvent.class,
+                event -> AntiVPN.getInstance().getPlayerExecutor().unloadPlayer(event.getPlayer().getUniqueId()));
+
         VelocityPlugin.INSTANCE.getServer().getEventManager().register(VelocityPlugin.INSTANCE, LoginEvent.class,
                 event -> {
-            if(event.getResult().isAllowed()) {
-                if(event.getPlayer().hasPermission("antivpn.bypass") //Has bypass permission
-                        //Is exempt
-                        || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId())
-                        //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
-                        || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getRemoteAddress()
-                        .getAddress().getHostAddress())
-                        || AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
-                        .anyMatch(prefix -> event.getPlayer().getUsername().startsWith(prefix))) return;
+                    if (event.getResult().isAllowed()) {
+                        if (event.getPlayer().hasPermission("antivpn.bypass") //Has bypass permission
+                                //Is exempt
+                                || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId())
+                                //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
+                                || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getRemoteAddress()
+                                .getAddress().getHostAddress())
+                                || AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
+                                .anyMatch(prefix -> event.getPlayer().getUsername().startsWith(prefix))) return;
 
-                checkIp(event.getPlayer().getRemoteAddress().getAddress().getHostAddress(),
-                        AntiVPN.getInstance().getVpnConfig().cachedResults(), result -> {
-                            if(result.isSuccess()) {
-                                // If the countryList() size is zero, no need to check.
-                                // Running country check first
-                                if(AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
-                                        // This bit of code will decide whether or not to kick the player
-                                        // If it contains the code and it is set to whitelist, it will not kick
-                                        // as they are equal and vise versa. However, if the contains does not match
-                                        // the state, it will kick.
-                                        && AntiVPN.getInstance().getVpnConfig().countryList()
-                                        .contains(result.getCountryCode())
-                                        != AntiVPN.getInstance().getVpnConfig().whitelistCountries()) {
-                                    //Using our built in kicking system if no commands are configured
-                                    if(AntiVPN.getInstance().getVpnConfig().countryKickCommands().size() == 0) {
-                                        final String kickReason = AntiVPN.getInstance().getVpnConfig()
-                                                .countryVanillaKickReason();
-                                        // Kicking our player
-                                        event.getPlayer().disconnect(LegacyComponentSerializer.builder().character('&')
-                                                .build().deserialize(kickReason
-                                                        .replace("%player%", event.getPlayer().getUsername())
-                                                        .replace("%country%", result.getCountryName())
-                                                        .replace("%code%", result.getCountryCode())));
+                        checkIp(event.getPlayer().getRemoteAddress().getAddress().getHostAddress(),
+                                AntiVPN.getInstance().getVpnConfig().cachedResults(), result -> {
+                                    if (result.isSuccess()) {
+                                        // If the countryList() size is zero, no need to check.
+                                        // Running country check first
+                                        if (AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
+                                                && !(AntiVPN.getInstance().getExecutor()
+                                                .isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
+                                                //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
+                                                || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer()
+                                                .getRemoteAddress().getAddress().getHostAddress()))
+                                                // This bit of code will decide whether or not to kick the player
+                                                // If it contains the code and it is set to whitelist, it will not kick
+                                                // as they are equal and vise versa. However, if the contains does not match
+                                                // the state, it will kick.
+                                                && AntiVPN.getInstance().getVpnConfig().countryList()
+                                                .contains(result.getCountryCode())
+                                                != AntiVPN.getInstance().getVpnConfig().whitelistCountries()) {
+                                            //Using our built in kicking system if no commands are configured
+                                            if (AntiVPN.getInstance().getVpnConfig().countryKickCommands().size() == 0) {
+                                                final String kickReason = AntiVPN.getInstance().getVpnConfig()
+                                                        .countryVanillaKickReason();
+                                                // Kicking our player
+                                                event.getPlayer().disconnect(LegacyComponentSerializer.builder().character('&')
+                                                        .build().deserialize(kickReason
+                                                                .replace("%player%", event.getPlayer().getUsername())
+                                                                .replace("%country%", result.getCountryName())
+                                                                .replace("%code%", result.getCountryCode())));
+                                            } else {
+                                                for (String cmd : AntiVPN.getInstance().getVpnConfig().countryKickCommands()) {
+                                                    final String formattedCommand = StringUtils
+                                                            .translateAlternateColorCodes('&',
+                                                                    cmd.replace("%player%",
+                                                                                    event.getPlayer().getUsername())
+                                                                            .replace("%country%", result.getCountryName())
+                                                                            .replace("%code%", result.getCountryCode()));
+                                                    // Running the command from console
+                                                    VelocityPlugin.INSTANCE.getServer().getCommandManager()
+                                                            .executeAsync(VelocityPlugin.INSTANCE.getServer()
+                                                                            .getConsoleCommandSource(),
+                                                                    StringUtils.translateAlternateColorCodes('&',
+                                                                            formattedCommand));
+                                                }
+                                            }
+                                        } else if (result.isProxy()) {
+                                            if (AntiVPN.getInstance().getVpnConfig().kickPlayersOnDetect())
+                                                event.getPlayer().disconnect(LegacyComponentSerializer.builder().character('&')
+                                                        .build().deserialize(AntiVPN.getInstance().getVpnConfig()
+                                                                .getKickString()));
+                                            VelocityPlugin.INSTANCE.getLogger().info(event.getPlayer().getUsername()
+                                                    + " joined on a VPN/Proxy (" + result.getMethod() + ")");
+                                            //Ensuring the user wishes to alert to staff
+                                            if (AntiVPN.getInstance().getVpnConfig().alertToStaff())
+                                                AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
+                                                        .filter(APIPlayer::isAlertsEnabled)
+                                                        .forEach(pl ->
+                                                                pl.sendMessage(AntiVPN.getInstance().getVpnConfig()
+                                                                        .alertMessage()
+                                                                        .replace("%player%",
+                                                                                event.getPlayer().getUsername())
+                                                                        .replace("%reason%",
+                                                                                result.getMethod())
+                                                                        .replace("%country%",
+                                                                                result.getCountryName())
+                                                                        .replace("%city%",
+                                                                                result.getCity())));
+
+                                            //In case the user wants to run their own commands instead of using the
+                                            // built in kicking
+                                            if (AntiVPN.getInstance().getVpnConfig().runCommands()) {
+                                                for (String command : AntiVPN.getInstance().getVpnConfig().commands()) {
+                                                    VelocityPlugin.INSTANCE.getServer().getCommandManager()
+                                                            .executeAsync(VelocityPlugin.INSTANCE.getServer()
+                                                                            .getConsoleCommandSource(),
+                                                                    StringUtils.translateAlternateColorCodes('&',
+                                                                            command.replace("%player%",
+                                                                                    event.getPlayer().getUsername())));
+                                                }
+                                            }
+                                            AntiVPN.getInstance().detections++;
+                                        }
                                     } else {
-                                        for (String cmd : AntiVPN.getInstance().getVpnConfig().countryKickCommands()) {
-                                            final String formattedCommand = StringUtils
-                                                    .translateAlternateColorCodes('&',
-                                                            cmd.replace("%player%",
-                                                                            event.getPlayer().getUsername())
-                                                                    .replace("%country%", result.getCountryName())
-                                                                    .replace("%code%", result.getCountryCode()));
-                                            // Running the command from console
-                                            VelocityPlugin.INSTANCE.getServer().getCommandManager()
-                                                    .executeAsync(VelocityPlugin.INSTANCE.getServer()
-                                                                    .getConsoleCommandSource(),
-                                                            StringUtils.translateAlternateColorCodes('&',
-                                                                    formattedCommand));
-                                        }
+                                        VelocityPlugin.INSTANCE.getLogger()
+                                                .log(Level.WARNING,
+                                                        "The API query was not a success! " +
+                                                                "You may need to upgrade your license on " +
+                                                                "https://funkemunky.cc/shop");
                                     }
-                                } else if(result.isProxy()) {
-                                    if(AntiVPN.getInstance().getVpnConfig().kickPlayersOnDetect())
-                                        event.getPlayer().disconnect(LegacyComponentSerializer.builder().character('&')
-                                                .build().deserialize(AntiVPN.getInstance().getVpnConfig()
-                                                        .getKickString()));
-                                    VelocityPlugin.INSTANCE.getLogger().info(event.getPlayer().getUsername()
-                                            + " joined on a VPN/Proxy (" + result.getMethod() + ")");
-                                    //Ensuring the user wishes to alert to staff
-                                    if(AntiVPN.getInstance().getVpnConfig().alertToStaff())
-                                        AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
-                                                .filter(APIPlayer::isAlertsEnabled)
-                                                .forEach(pl ->
-                                                        pl.sendMessage(AntiVPN.getInstance().getVpnConfig()
-                                                                .alertMessage()
-                                                                .replace("%player%",
-                                                                        event.getPlayer().getUsername())
-                                                                .replace("%reason%",
-                                                                        result.getMethod())
-                                                                .replace("%country%",
-                                                                        result.getCountryName())
-                                                                .replace("%city%",
-                                                                        result.getCity())));
-
-                                    //In case the user wants to run their own commands instead of using the
-                                    // built in kicking
-                                    if(AntiVPN.getInstance().getVpnConfig().runCommands()) {
-                                        for (String command : AntiVPN.getInstance().getVpnConfig().commands()) {
-                                            VelocityPlugin.INSTANCE.getServer().getCommandManager()
-                                                    .executeAsync(VelocityPlugin.INSTANCE.getServer()
-                                                                    .getConsoleCommandSource(),
-                                                            StringUtils.translateAlternateColorCodes('&',
-                                                                    command.replace("%player%",
-                                                                            event.getPlayer().getUsername())));
-                                        }
-                                    }
-                                    AntiVPN.getInstance().detections++;
-                                }
-                            } else {
-                                VelocityPlugin.INSTANCE.getLogger()
-                                        .log(Level.WARNING,
-                                                "The API query was not a success! " +
-                                                        "You may need to upgrade your license on " +
-                                                        "https://funkemunky.cc/shop");
-                            }
-                            AntiVPN.getInstance().checked++;
-                        });
-            }
-        });
+                                    AntiVPN.getInstance().checked++;
+                                });
+                    }
+                });
     }
 
     @Override
@@ -131,7 +140,7 @@ public class VelocityListener extends VPNExecutor {
 
     @Override
     public void shutdown() {
-        if(cacheResetTask != null) {
+        if (cacheResetTask != null) {
             cacheResetTask.cancel();
             cacheResetTask = null;
         }

Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityPlayerExecutor.java

@@ -9,13 +9,14 @@ import java.util.stream.Collectors;
 
 public class VelocityPlayerExecutor implements PlayerExecutor {
 
-    private final Map<Player, VelocityPlayer> cachedPlayers = new WeakHashMap<>();
+    private final Map<UUID, VelocityPlayer> cachedPlayers = new HashMap<>();
 
     @Override
     public Optional<APIPlayer> getPlayer(String name) {
         Optional<Player> player = VelocityPlugin.INSTANCE.getServer().getPlayer(name);
 
-        return player.map(value -> cachedPlayers.computeIfAbsent(value, VelocityPlayer::new));
+        return player.map(value -> cachedPlayers.computeIfAbsent(value.getUniqueId(),
+                key -> new VelocityPlayer(value)));
 
     }
 
@@ -23,13 +24,19 @@ public class VelocityPlayerExecutor implements PlayerExecutor {
     public Optional<APIPlayer> getPlayer(UUID uuid) {
         Optional<Player> player = VelocityPlugin.INSTANCE.getServer().getPlayer(uuid);
 
-        return player.map(value -> cachedPlayers.computeIfAbsent(value, VelocityPlayer::new));
+        return player.map(value -> cachedPlayers.computeIfAbsent(value.getUniqueId(),
+                key -> new VelocityPlayer(value)));
+    }
+
+    @Override
+    public void unloadPlayer(UUID uuid) {
+        cachedPlayers.remove(uuid);
     }
 
     @Override
     public List<APIPlayer> getOnlinePlayers() {
         return VelocityPlugin.INSTANCE.getServer().getAllPlayers().stream()
-                .map(pl -> cachedPlayers.computeIfAbsent(pl, VelocityPlayer::new))
+                .map(pl -> cachedPlayers.computeIfAbsent(pl.getUniqueId(), key -> new VelocityPlayer(pl)))
                 .collect(Collectors.toList());
     }
 }

pom.xml

@@ -7,7 +7,7 @@
     <groupId>dev.brighten.antivpn</groupId>
     <artifactId>AntiVPN</artifactId>
     <packaging>pom</packaging>
-    <version>1.8</version>
+    <version>1.8.1</version>
 
     <modules>
         <module>Common</module>