From 279aa56c1a56eae06e66484dc12a1b04c2c01266 Mon Sep 17 00:00:00 2001
From: Baktus79 <martinsen@hotmail.com>
Date: Mon, 31 Oct 2022 19:22:01 +0100
Subject: [PATCH 1/2] Bumped to v1.6.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 393c32a..b98c6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>no.vestlandetmc.bfc</groupId>
 	<artifactId>BanFromClaim</artifactId>
-	<version>1.6.4</version>
+	<version>1.6.5</version>
 	<packaging>jar</packaging>
 
 	<name>BanFromClaim</name>

From 6c764e507068182e8860d0bfb086d89b4a54d2ff Mon Sep 17 00:00:00 2001
From: Baktus79 <martinsen@hotmail.com>
Date: Mon, 31 Oct 2022 19:22:26 +0100
Subject: [PATCH 2/2] Fixed a ConcurrentModificationException bug

---
 .../BanFromClaim/handler/CombatScheduler.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/no/vestlandetmc/BanFromClaim/handler/CombatScheduler.java b/src/main/java/no/vestlandetmc/BanFromClaim/handler/CombatScheduler.java
index 70d9769..0ffe4b0 100644
--- a/src/main/java/no/vestlandetmc/BanFromClaim/handler/CombatScheduler.java
+++ b/src/main/java/no/vestlandetmc/BanFromClaim/handler/CombatScheduler.java
@@ -15,13 +15,13 @@ public class CombatScheduler extends BukkitRunnable {
 	@Override
 	public void run() {
 		if(CombatMode.isEmpty()) { return; }
-
 		for(final Entry<UUID, Long> combat : CombatMode.getAllTime().entrySet()) {
+			final UUID uuid = combat.getKey();
+			final UUID attackerUUID = CombatMode.getAttacker(uuid);
+			if(attackerUUID == null) { continue; }
 
-			if(CombatMode.getAttacker(combat.getKey()) == null) { continue; }
-
-			final OfflinePlayer victim = Bukkit.getOfflinePlayer(combat.getKey());
-			final OfflinePlayer attacker = Bukkit.getOfflinePlayer(CombatMode.getAttacker(combat.getKey()));
+			final OfflinePlayer victim = Bukkit.getOfflinePlayer(uuid);
+			final OfflinePlayer attacker = Bukkit.getOfflinePlayer(attackerUUID);
 			final long time = combat.getValue();
 			final long newTime = System.currentTimeMillis() / 1000;
 			final long combatTime = newTime - time;