diff --git a/src/main/java/com/alttd/ctf/flag/Flag.java b/src/main/java/com/alttd/ctf/flag/Flag.java index 78808ec..f4f6df0 100644 --- a/src/main/java/com/alttd/ctf/flag/Flag.java +++ b/src/main/java/com/alttd/ctf/flag/Flag.java @@ -81,10 +81,18 @@ public class Flag implements Runnable { if (flagCarrier != null) { return; } + Team team = teamPlayer.getTeam(); flagLocation.getNearbyPlayers(5).forEach(nearbyPlayer -> { if (nearbyPlayer.getUniqueId().equals(player.getUniqueId())) { return; } + Optional nearByTeamPlayer = gameManager.getTeamPlayer(nearbyPlayer); + if (nearByTeamPlayer.isEmpty()) { + return; + } else if (nearByTeamPlayer.get().getTeam().equals(team)) { + return; + } + Vector direction = nearbyPlayer.getLocation().toVector().subtract(flagLocation.toVector()).normalize(); direction.setY(0.2); nearbyPlayer.setVelocity(direction.multiply(5)); diff --git a/version.properties b/version.properties index 866d440..e0f2f7a 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,3 @@ -#Sat Mar 01 19:29:28 CET 2025 -buildNumber=102 +#Sat Mar 01 20:08:55 CET 2025 +buildNumber=103 version=0.1