funkemunky/AntiVPN
1
0
Fork 0
mirror of https://github.com/funkemunky/AntiVPN.git synced 2026-05-31 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from C0D3-M4513R/patch-bukkit-banned-whitelist

Browse Source 
Add null checks to ip check on login
This commit is contained in:
Dawson
2023-10-30 10:05:51 -04:00
committed by GitHub
parent 26cfc3e3f8 50e7059597
commit bc666447c5
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java
+13 -7
View File
@@ -19,6 +19,8 @@ import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
@@ -116,13 +118,17 @@ public class BukkitListener extends VPNExecutor implements Listener {
event.getPlayer().getUniqueId().toString());
return;
}
//If the IP is whitelisted, we don't want to kick them
if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
.getHostAddress())) {
log("IP is whitelisted: %s",
event.getPlayer().getAddress().getAddress().getHostAddress());
return;
{
//If the IP is whitelisted, we don't want to kick them
InetSocketAddress address = event.getPlayer().getAddress();
if (address != null){
InetAddress address1 = address.getAddress();
if (address1 != null && AntiVPN.getInstance().getExecutor().isWhitelisted(address1.getHostAddress())) {
log("IP is whitelisted: %s",
address1.getHostAddress());
return;
}
}
}
// If the countryList() size is zero, no need to check.