Add minimum players to auto search, optional check if player is in PV…

…P world for auto checker
Dmck2b · Sep 8, 2014 · c05b16a · c05b16a
1 parent 4ec8853
commit c05b16a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/src/main/java/tk/maciekmm/antiaura/AntiAura.java b/src/main/java/tk/maciekmm/antiaura/AntiAura.java
@@ -40,6 +40,7 @@
 
 
 public class AntiAura extends JavaPlugin implements Listener {
+
     private HashMap<UUID, AuraCheck> running = new HashMap<>();
     public static int total;
     private static int autoBanCount;
@@ -55,6 +56,11 @@ public class AntiAura extends JavaPlugin implements Listener {
     private boolean visOrInvisible;
     private boolean visCmd;
     public static final Random RANDOM = new Random();
+    private int minToAutoRun;
+    private boolean worldPvpCheck;
+    private boolean iCanHasPVP = false;
+    private int count = 0;
+    private int maxToCheck;
 
     public void onEnable() {
         this.saveDefaultConfig();
@@ -68,6 +74,9 @@ public void onEnable() {
         customCommandToggle = this.getConfig().getBoolean("customBanCommand.enable", false);
         customCommand = this.getConfig().getString("customBanCommand.command", "ban %player");
         visOrInvisible = this.getConfig().getBoolean("settings.invisibility", false);
+        minToAutoRun = this.getConfig().getInt("settings.min-players-to-autorun", 5);
+        worldPvpCheck = this.getConfig().getBoolean("player-checks.world", true);
+        maxToCheck = this.getConfig().getInt("player-checks.max-to-check", 10);
         this.getServer().getPluginManager().registerEvents(this, this);
 
         if(type.equalsIgnoreCase("running") || type.equalsIgnoreCase("standing")) {
@@ -78,14 +87,41 @@ public void onEnable() {
             Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
                 @Override
                 public void run() {
-                    if(Bukkit.getOnlinePlayers().length > 0) {
-                        String player = org.bukkit.Bukkit.getOnlinePlayers()[RANDOM.nextInt(Bukkit.getOnlinePlayers().length)].getName();
-                        org.bukkit.Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "auracheck " + player);
+                    if(Bukkit.getOnlinePlayers().length > minToAutoRun) {
+                        if(worldPvpCheck) {
+                            findPlayerWorld();
+                        } else {
+                            autoCheckExecute(getRandomPlayer().getName());
+                        }
                     }
                 }
             }, 800L, runEvery);
         }
     }
+
+    public Player getRandomPlayer() {
+        return org.bukkit.Bukkit.getOnlinePlayers()[RANDOM.nextInt(Bukkit.getOnlinePlayers().length)];
+    }
+
+    public void findPlayerWorld() {
+        while(!iCanHasPVP) {
+            if(count > maxToCheck) {
+                count = 0;
+                break;
+            }
+            Player player = getRandomPlayer();
+            count++;
+            if(player.getWorld().getPVP()) {
+                iCanHasPVP = true;
+                autoCheckExecute(player.getName());
+            }
+        }
+        iCanHasPVP = false;
+    }
+
+    public void autoCheckExecute(String player) {
+        org.bukkit.Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "auracheck " + player);
+    }
 
     public void register() {
         ProtocolLibrary.getProtocolManager().addPacketListener(

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -5,11 +5,15 @@ settings:
     autoBanOnXPlayers: 3 # If someone kills this many, they will be autobanned
     silentBan: true # If false, user will be kicked on ban, always enabled if using a custom command
     randomlyRun: true # Randomly select a player
+    min-players-to-autorun: 5 # Minimum players to to the auto check
     runEvery: 2400 # If above is true, how many ticks between each check
     defaultType: "running" # Running or standing style
 messages:
     banMessage: "ANTI-AURA: Passed threshold" # Ban message
     kickMessage: "ANTI-AURA: Passed threshold" # Kick message
 customBanCommand:
     enable: false
-    command: ban %player
+    command: ban %player
+player-checks:
+    world: true
+    max-to-check: 10