From 89aef08bedb4672521dd130c5ff2be6613a2c4b2 Mon Sep 17 00:00:00 2001
From: Acentech Dev <acentech_dev@affinitybox.com>
Date: Tue, 21 Jul 2026 00:19:43 +0300
Subject: [PATCH] feat(hs): block friendly-fire within the same team

---
 src/GameLogic/Player.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/GameLogic/Player.cs b/src/GameLogic/Player.cs
index 765c12b..d55a86a 100644
--- a/src/GameLogic/Player.cs
+++ b/src/GameLogic/Player.cs
@@ -736,6 +736,15 @@ public class Player : AsyncDisposable, IBucketMapObserver, IAttackable, IAttacke
             return null;
         }
 
+        // ADAMU-CUSTOM: Heykel Savasi -> same-team players cannot damage each other.
+        if (this.CurrentMiniGame is HeykelSavasiContext heykelSavasi
+            && attacker is Player heykelAttacker
+            && heykelSavasi.GetTeam(this) != HeykelSavasiTeam.None
+            && heykelSavasi.GetTeam(this) == heykelSavasi.GetTeam(heykelAttacker))
+        {
+            return null;
+        }
+
         var hitInfo = await attacker.CalculateDamageAsync(this, skill, isCombo, damageFactor).ConfigureAwait(false);
 
         if (skill?.Skill is not { } attackSkill || attackSkill.DamageType != DamageType.Fenrir)