From 470f8613cd48443b26ea03eaebcdd61e5355a21d Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 6 Feb 2024 22:50:42 +0100 Subject: [PATCH] Add logging to debug team area bugs Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/listener/ArenaBorder.java | 4 ++-- .../src/de/steamwar/fightsystem/listener/Border.java | 7 ++++++- .../src/de/steamwar/fightsystem/listener/TeamArea.java | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java index caf36f6..4c0daa4 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java @@ -39,8 +39,8 @@ import org.bukkit.event.player.PlayerQuitEvent; public class ArenaBorder implements Listener { - private final Border spectatorBorder = new Border(Config.PlayerRegion, true, 5, "NO_ARENA_LEAVING"); - private final Border playerBorder = new Border(Config.PlayerRegion.to2d(), true, 5, "NO_ARENA_LEAVING"); + private final Border spectatorBorder = new Border(Config.PlayerRegion, true, 5, "NO_ARENA_LEAVING", "ArenaBorder.spectatorBorder"); + private final Border playerBorder = new Border(Config.PlayerRegion.to2d(), true, 5, "NO_ARENA_LEAVING", "ArenaBorder.playerBorder"); public ArenaBorder() { new StateDependentListener(ArenaMode.All, FightState.All, this); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java index 6f8bddd..043dcf0 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java @@ -36,6 +36,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.logging.Level; public class Border { @@ -43,13 +44,15 @@ public class Border { private final Map lastLocation = new HashMap<>(); private final boolean contain; private final String resetMessage; + private final String name; private final Region region; private final int ghostRange; private final int ghostSize; - public Border(Region region, boolean contain, int ghostRange, String resetMessage) { + public Border(Region region, boolean contain, int ghostRange, String resetMessage, String name) { this.contain = contain; this.resetMessage = resetMessage; + this.name = name; this.region = region; this.ghostRange = ghostRange; this.ghostSize = 2*ghostRange + 1; @@ -63,6 +66,7 @@ public class Border { ghostBarriers.put(player, new HashSet<>()); lastLocation.put(player, player.getLocation()); + FightSystem.getPlugin().getLogger().log(Level.INFO, () -> player.getName() + " was added to border " + name); } public boolean contains(Player player) { @@ -70,6 +74,7 @@ public class Border { } public void removePlayer(Player player) { + FightSystem.getPlugin().getLogger().log(Level.INFO, () -> player.getName() + " was removed from border " + name); lastLocation.remove(player); Set blocks = ghostBarriers.remove(player); if(blocks == null || !player.isOnline()) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java index cf241bd..2720b25 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java @@ -52,8 +52,8 @@ public class TeamArea implements Listener { public TeamArea(FightTeam team) { this.team = team; - this.spectatorBorder = new Border(team.getExtendRegion(), false, 5, "NO_TEAMAREA"); - this.bordingBorder = new Border(team.getExtendRegion().to2d(), true, 1, "NO_ENTERN"); + this.spectatorBorder = new Border(team.getExtendRegion(), false, 5, "NO_TEAMAREA", team.getName() + ".spectatorBorder"); + this.bordingBorder = new Border(team.getExtendRegion().to2d(), true, 1, "NO_ENTERN", team.getName() + ".boardingBorder"); new StateDependentListener(ArenaMode.AntiTest, FightState.All, this); new StateDependentTask(ArenaMode.AntiTest, FightState.TeamFix, this::realSpectatorCheck, 1, 1);