From cb744f6aa040be96bd4ab5b02999cd4db6554f43 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Tue, 18 Aug 2026 10:48:16 +0200 Subject: [PATCH] Add AntiPlayerCollision --- .../features/world/AntiPlayerCollision.java | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiPlayerCollision.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiPlayerCollision.java index 83b5df3a..119dd65d 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiPlayerCollision.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiPlayerCollision.java @@ -20,34 +20,22 @@ package de.steamwar.bausystem.features.world; import de.steamwar.linkage.Linked; -import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; @Linked public class AntiPlayerCollision implements Listener { - private static Team TEAM = getTeam(); - - private static Team getTeam() { - Scoreboard board = Bukkit.getScoreboardManager().getMainScoreboard(); + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerJoin(PlayerJoinEvent event) { + Scoreboard board = event.getPlayer().getScoreboard(); Team team = board.getTeam("players"); if (team == null) team = board.registerNewTeam("players"); team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER); - return team; - } - - @EventHandler - public void onPlayerJoin(PlayerJoinEvent event) { - TEAM.addPlayer(event.getPlayer()); - } - - @EventHandler - public void onPlayerQuit(PlayerQuitEvent event) { - TEAM.removePlayer(event.getPlayer()); + team.addPlayer(event.getPlayer()); } }