1212import org .bukkit .event .Listener ;
1313import org .bukkit .event .player .PlayerMoveEvent ;
1414import org .bukkit .event .player .PlayerTeleportEvent ;
15+ import org .bukkit .plugin .Plugin ;
1516
1617public 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