From 95b54d1a032da64b564df842370c8e0826d5e295 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sat, 1 Mar 2025 20:17:41 +0100
Subject: [PATCH] Prevent same-team players from being knocked back by flags.

Added a check to ensure players on the same team as the flag carrier are not affected by knockback when near the flag. Updated the build number to reflect the new changes.
---
 src/main/java/com/alttd/ctf/flag/Flag.java | 8 ++++++++
 version.properties                         | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

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<TeamPlayer> 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