Skip to content

Commit d9a0e46

Browse files
committed
Add 5 tick delay which reduces 90% of done tests - remove initial solution
Took 47 minutes
1 parent 365d4fa commit d9a0e46

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public void onEnable() {
180180
new FightEffectController(pluginConfig.effect, this.fightEffectService, this.fightManager, this.getServer()),
181181
new FightTagOutController(this.fightTagOutService),
182182
new FightMessageController(this.fightManager, noticeService, pluginConfig, this.getServer()),
183-
new BorderTriggerController(borderService, () -> pluginConfig.border, fightManager, server),
183+
new BorderTriggerController(borderService, () -> pluginConfig.border, fightManager, server, this),
184184
new ParticleController(borderService, () -> pluginConfig.border.particle, scheduler, server),
185185
new BorderBlockController(borderService, () -> pluginConfig.border.block, scheduler, server),
186186
new EndCrystalListener(this, this.fightManager, pluginConfig),

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,28 @@
1212
import org.bukkit.event.Listener;
1313
import org.bukkit.event.player.PlayerMoveEvent;
1414
import org.bukkit.event.player.PlayerTeleportEvent;
15+
import org.bukkit.plugin.Plugin;
1516

1617
public class BorderTriggerController implements Listener {
1718

1819
private final BorderService borderService;
1920
private final Supplier<BorderSettings> border;
2021
private final FightManager fightManager;
2122
private final Server server;
22-
23-
public BorderTriggerController(BorderService borderService, Supplier<BorderSettings> border, FightManager fightManager, Server server) {
23+
private final Plugin plugin;
24+
25+
public BorderTriggerController(
26+
BorderService borderService,
27+
Supplier<BorderSettings> border,
28+
FightManager fightManager,
29+
Server server,
30+
Plugin plugin
31+
) {
2432
this.borderService = borderService;
2533
this.border = border;
2634
this.fightManager = fightManager;
2735
this.server = server;
36+
this.plugin = plugin;
2837
}
2938

3039
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
@@ -41,7 +50,6 @@ void onMove(PlayerMoveEvent event) {
4150

4251
Player player = event.getPlayer();
4352
if (!fightManager.isInCombat(player.getUniqueId())) {
44-
borderService.clearBorder(player);
4553
return;
4654
}
4755

@@ -87,7 +95,6 @@ void onFightEnd(FightUntagEvent event) {
8795
return;
8896
}
8997

90-
borderService.clearBorder(player);
98+
this.server.getScheduler().runTaskLater(this.plugin,() -> this.borderService.clearBorder(player), 5);
9199
}
92-
93100
}

0 commit comments

Comments
 (0)