optimised code to utilize bukkitrunnables to prevent crashing and prevent multiple of the same timers being run at once

Author: BuildTools

src/main/java/com/azortis/combatlog/CombatLog.java

@@ -23,12 +23,9 @@ public void onEnable() {
         combatManager = new CombatManager(this);
 
         if(WorldGuardHook.init()) {
-            worldGuardManager = new WorldGuardManager(this);
+            worldGuardManager = new WorldGuardManager(this, combatManager);
         }
 
-
-
-
     }
 
     @Override

src/main/java/com/azortis/combatlog/listener/CombatListener.java

@@ -51,7 +51,8 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
                 break;
         }
         if (damager != null && damager != player) {
-            manager.processAttack(player, damager);
+            manager.combatTimer.put(player.getUniqueId(), 30);
+            manager.combatTimer.put(damager.getUniqueId(), 30);
         }
     }
 

src/main/java/com/azortis/combatlog/listener/WorldGuardListener.java

@@ -1,10 +1,10 @@
 package com.azortis.combatlog.listener;
 
+import com.azortis.combatlog.managers.CombatManager;
 import com.azortis.combatlog.managers.WorldGuardManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.World;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.StateFlag;
@@ -16,35 +16,45 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerMoveEvent;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class WorldGuardListener implements Listener {
 
     private WorldGuardManager worldGuardManager;
+    private CombatManager combatManager;
     private List<Location> locations = new ArrayList<>();
     private Map<String, ProtectedRegion> regions = new HashMap<>();
     private List<ProtectedRegion> noPvpRegions = new ArrayList<>();
     private RegionContainer container;
-    private RegionManager regionManager;
 
-    public WorldGuardListener(WorldGuardManager worldGuardManager) {
+    public WorldGuardListener(WorldGuardManager worldGuardManager, CombatManager combatManager) {
         this.worldGuardManager = worldGuardManager;
+        this.combatManager = combatManager;
         container = WorldGuard.getInstance().getPlatform().getRegionContainer();
+        TimerTask task = new TimerTask() {
+            @Override
+            public void run() {
+                worldGuardTimer();
+            }
+        };
+       new Timer().schedule(task, 0, 2);
+    }
+
+    public void worldGuardTimer(){
+        combatManager.combatTimer.forEach((key,value) -> {
+            //todo find a way to implement combatManager
+            //key == UUID
+            //value == combat time
+            Player player = Bukkit.getPlayer(key);
+            RegionManager regionManager = container.get(BukkitAdapter.adapt(player.getWorld()));
+            if(regionManager != null) return;
+            worldGuardProcessing(player, regionManager);
+        });
     }
 
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerMovement(PlayerMoveEvent event) {
-        Player player = event.getPlayer();
-        regionManager = container.get(BukkitAdapter.adapt(player.getWorld()));
-        if(regionManager == null) return;
+    public void worldGuardProcessing(Player player, RegionManager regionManager) {
         regions = regionManager.getRegions();
         regions.forEach((key,value) -> {
             if(value.getFlag(Flags.PVP) == StateFlag.State.ALLOW) {

src/main/java/com/azortis/combatlog/managers/CombatManager.java

@@ -2,6 +2,7 @@
 
 import com.azortis.combatlog.CombatLog;
 import com.azortis.combatlog.listener.CombatListener;
+import com.azortis.combatlog.listener.WorldGuardListener;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.EntityType;
@@ -18,30 +19,23 @@ public class CombatManager {
 
     public CombatManager(CombatLog plugin) {
         this.plugin = plugin;
-
-
-        Bukkit.getServer().getPluginManager().registerEvents(new CombatListener(this), plugin);
-    }
-
-    public void processAttack(Player damaged, Player damager) {
-        combatTimer.put(damaged.getUniqueId(), 30);
-        combatTimer.put(damager.getUniqueId(), 30);
         new BukkitRunnable() {
             @Override
             public void run() {
-                if(combatTimer.get(damaged.getUniqueId()) == 0){
-                    combatTimer.remove(damaged.getUniqueId());
-                } else if (combatTimer.get(damaged.getUniqueId()) > 0) {
-                    combatTimer.put(damaged.getUniqueId(), combatTimer.get(damaged.getUniqueId()) - 1);
-                }
-                if(combatTimer.get(damager.getUniqueId()) == 0){
-                    combatTimer.remove(damager.getUniqueId());
-                } else if (combatTimer.get(damager.getUniqueId()) > 0) {
-                    combatTimer.put(damager.getUniqueId(), combatTimer.get(damager.getUniqueId()) - 1);
-                }
-                if(combatTimer.containsKey(damaged.getUniqueId()) && combatTimer.containsKey(damager.getUniqueId())) cancel();
+                processAttack();
             }
         }.runTaskTimer(plugin, 20, 20);
+        Bukkit.getServer().getPluginManager().registerEvents(new CombatListener(this), plugin);
+    }
+
+    public void processAttack() {
+        combatTimer.forEach((key, value) -> {
+            if(value == 0){
+                combatTimer.remove(key);
+            } else if (value > 0) {
+                combatTimer.put(key, value-1);
+            }
+        });
     }
 
     public void trackingCreeper(Player player) {
@@ -50,7 +44,4 @@ public void trackingCreeper(Player player) {
         creeperSpawner.get(player.getUniqueId()).add(creeper);
     }
 
-    public void spawnVillager(Player player){
-
-    }
 }

src/main/java/com/azortis/combatlog/managers/WorldGuardManager.java

@@ -1,29 +1,19 @@
 package com.azortis.combatlog.managers;
 
 import com.azortis.combatlog.CombatLog;
-import com.azortis.combatlog.hook.WorldGuardHook;
 import com.azortis.combatlog.listener.WorldGuardListener;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import java.util.List;
 
 public class WorldGuardManager {
 
-    private final CombatLog plugin;
-    private static WorldGuardHook instance;
+    public final CombatLog plugin;
+    public CombatManager combatManager;
 
-    public WorldGuardManager(CombatLog plugin) {
-        this.plugin = plugin;
-        instance = WorldGuardHook.getInstance();
-        Bukkit.getServer().getPluginManager().registerEvents(new WorldGuardListener(this), plugin);
+    public WorldGuardManager(CombatLog combatLog, CombatManager combatManager) {
+        this.plugin = combatLog;
+        this.combatManager = combatManager;
+        this.
+        Bukkit.getServer().getPluginManager().registerEvents(new WorldGuardListener(this, combatManager), plugin);
     }
 
-    public void fakeBlockSpawn(List<Location> locations, Player player) {
-        for(Location location: locations) {
-            player.sendBlockChange(location, Material.RED_STAINED_GLASS.createBlockData());
-        }
-    }
-}
+}