funkemunky/AntiVPN
1
0
Fork 0
mirror of https://github.com/funkemunky/AntiVPN.git synced 2026-06-10 21:50:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug that prevented players from getting kicked and fixes alerts not being populated

Browse Source
This commit is contained in:
Dawson Hessler
2021-08-27 14:44:40 -04:00
parent 3b15a4c919
commit 334c894fe2
4 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java
+5 -1
View File
@@ -61,7 +61,11 @@ public class BungeeListener extends VPNExecutor implements Listener {
if(AntiVPN.getInstance().getConfig().alertToStaff()) //Ensuring the user wishes to alert to staff
AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
.filter(APIPlayer::isAlertsEnabled)
.forEach(pl -> pl.sendMessage(AntiVPN.getInstance().getConfig().alertMessage()));
.forEach(pl -> pl.sendMessage(AntiVPN.getInstance().getConfig().alertMessage()
.replace("%player%", event.getPlayer().getName())
.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().getConfig().runCommands()) {
Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlayerExecutor.java
+8 -6
View File
@@ -5,20 +5,20 @@ import dev.brighten.antivpn.api.PlayerExecutor;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;
public class BungeePlayerExecutor implements PlayerExecutor {
private final Map<ProxiedPlayer, BungeePlayer> cachedPlayers = new WeakHashMap<>();
@Override
public Optional<APIPlayer> getPlayer(String name) {
ProxiedPlayer player = BungeeCord.getInstance().getPlayer(name);
if(player == null) return Optional.empty();
return Optional.of(new BungeePlayer(player));
return Optional.of(cachedPlayers.computeIfAbsent(player, BungeePlayer::new));
}
@Override
@@ -27,11 +27,13 @@ public class BungeePlayerExecutor implements PlayerExecutor {
if(player == null) return Optional.empty();
return Optional.of(new BungeePlayer(player));
return Optional.of(cachedPlayers.computeIfAbsent(player, BungeePlayer::new));
}
@Override
public List<APIPlayer> getOnlinePlayers() {
return BungeeCord.getInstance().getPlayers().stream().map(BungeePlayer::new).collect(Collectors.toList());
return BungeeCord.getInstance().getPlayers().stream()
.map(pl -> cachedPlayers.computeIfAbsent(pl, BungeePlayer::new))
.collect(Collectors.toList());
}
}