GH-285 Remove border when player is not in combat (#290)

* Remove border when player is not in combat. Add WorldEdit for easier tests

* Add 5 tick delay which reduces 90% of done tests - remove initial solution

* Resolve AI review

* Use our scheduler, add isInCombat check to negate race condition

* Add comment explaining race confition, follow rollczi suggestion

Author: CitralFlo

eternalcombat-plugin/build.gradle.kts

@@ -88,7 +88,10 @@ bukkit {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.9")
+        minecraftVersion("1.21.8")
+        downloadPlugins.url("https://cdn.modrinth.com/data/1u6JkXh5/versions/Jk1z2u7n/worldedit-bukkit-7.3.16.jar")
+        downloadPlugins.url("https://github.com/retrooper/packetevents/releases/download/v2.9.5/packetevents-spigot-2.9.5.jar")
+        downloadPlugins.url("https://cdn.modrinth.com/data/DKY9btbd/versions/PO4MKx7e/worldguard-bukkit-7.0.14-dist.jar")
     }
 }
 

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

@@ -50,7 +50,6 @@
 import com.eternalcode.commons.adventure.AdventureLegacyColorPostProcessor;
 import com.eternalcode.commons.adventure.AdventureLegacyColorPreProcessor;
 import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
-import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.multification.notice.Notice;
 import com.google.common.base.Stopwatch;
 import dev.rollczi.litecommands.LiteCommands;
@@ -180,7 +179,7 @@ public void onEnable() {
             new FightEffectController(pluginConfig.effect, this.fightEffectService, this.fightManager, this.getServer()),
             new FightTagOutController(this.fightTagOutService),
             new FightMessageController(this.fightManager, noticeService, pluginConfig, this.getServer()),
-            new BorderTriggerController(borderService, () -> pluginConfig.border, fightManager, server),
+            new BorderTriggerController(borderService, () -> pluginConfig.border, fightManager, server, scheduler),
             new ParticleController(borderService, () -> pluginConfig.border.particle, scheduler, server),
             new BorderBlockController(borderService, () -> pluginConfig.border.block, scheduler, server),
             new EndCrystalListener(this, this.fightManager, pluginConfig),

eternalcombat-plugin/src/main/java/com/eternalcode/combat/border/BorderTriggerController.java

@@ -3,6 +3,8 @@
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.event.FightTagEvent;
 import com.eternalcode.combat.fight.event.FightUntagEvent;
+import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
+import java.time.Duration;
 import java.util.function.Supplier;
 import org.bukkit.Location;
 import org.bukkit.Server;
@@ -15,16 +17,26 @@
 
 public class BorderTriggerController implements Listener {
 
+    private static final long BORDER_WORK_AROUND_DELAY_MILLIS = 250;
+
     private final BorderService borderService;
     private final Supplier<BorderSettings> border;
     private final FightManager fightManager;
     private final Server server;
-
-    public BorderTriggerController(BorderService borderService, Supplier<BorderSettings> border, FightManager fightManager, Server server) {
+    private final MinecraftScheduler scheduler;
+
+    public BorderTriggerController(
+        BorderService borderService,
+        Supplier<BorderSettings> border,
+        FightManager fightManager,
+        Server server,
+        MinecraftScheduler scheduler
+    ) {
         this.borderService = borderService;
         this.border = border;
         this.fightManager = fightManager;
         this.server = server;
+        this.scheduler = scheduler;
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
@@ -86,7 +98,11 @@ void onFightEnd(FightUntagEvent event) {
             return;
         }
 
-        borderService.clearBorder(player);
+        // Due to race condition in PlayerMoveEvent and FightUntagEvent - border can be triggered after death and untag of player - solution delayed removal of border
+        this.scheduler.runLater(() -> {
+            if (!this.fightManager.isInCombat(player.getUniqueId())) {
+                this.borderService.clearBorder(player);
+            }
+        }, Duration.ofMillis(BORDER_WORK_AROUND_DELAY_MILLIS));
     }
-
 }