atfatmc/AdamuSw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(hs): block friendly-fire within the same team

Browse Source
This commit is contained in:
Acentech Dev
2026-07-21 00:19:43 +03:00
parent ceacc11446
commit 89aef08bed
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/GameLogic/Player.cs
View File

@@ -736,6 +736,15 @@ public class Player : AsyncDisposable, IBucketMapObserver, IAttackable, IAttacke
return null; 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); var hitInfo = await attacker.CalculateDamageAsync(this, skill, isCombo, damageFactor).ConfigureAwait(false);
if (skill?.Skill is not { } attackSkill || attackSkill.DamageType != DamageType.Fenrir) if (skill?.Skill is not { } attackSkill || attackSkill.DamageType != DamageType.Fenrir)