Remove DistanceFromAttacker

Author: kolexxx

.sbproj

@@ -347,14 +347,14 @@
     },
     "LaunchConfigs": [
       {
-        "Name": "My New Config",
+        "Name": "Test",
         "GameIdent": "matt.ttt#local",
-        "MapName": "facepunch.square",
-        "MaxPlayers": 1,
+        "MapName": "facepunch.flatgrass",
+        "MaxPlayers": 64,
         "GameSettings": {},
         "Addons": "",
         "PreLaunchCommand": "",
-        "PostLaunchCommand": ""
+        "PostLaunchCommand": "ttt_preround_time 1; ttt_postround_time 1;"
       }
     ]
   }

code/Items/Base/Weapon.cs

@@ -255,13 +255,8 @@ protected virtual void ShootBullet( float spread, float force, float damage, flo
 						.WithAttacker( Owner )
 						.WithWeapon( this );
 
-					if ( trace.Entity is Player player )
-					{
-						player.DistanceToAttacker = Vector3.DistanceBetween( Owner.Position, player.Position ).SourceUnitsToMeters();
-
-						if ( Info.IsSilenced || damageInfo.IsHeadshot() )
-							damageInfo.Tags.Add( "silent" );
-					}
+					if ( trace.Entity is Player && (Info.IsSilenced || damageInfo.IsHeadshot()) )
+						damageInfo.Tags.Add( "silent" );
 
 					trace.Entity.TakeDamage( damageInfo );
 				}

code/Items/Equipment/DNA/DNAScanner.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using static TTT.TTTEvent;
 
 namespace TTT;
 
@@ -212,8 +213,9 @@ protected override void OnActivate()
 		{
 			case Corpse corpse:
 			{
+				var distance = Vector3.DistanceBetween( corpse.Player.Position, corpse.Player.LastAttacker.Position ).SourceUnitsToMeters();
 				SourceName = $"{corpse.Player.SteamName}'s corpse";
-				TimeUntilDecayed = MathF.Pow( 0.74803f * corpse.Player.DistanceToAttacker, 2 ) + 100;
+				TimeUntilDecayed = MathF.Pow( 0.74803f * distance, 2 ) + 100;
 
 				break;
 			}

code/Items/Weapons/Knife.cs

@@ -80,8 +80,6 @@ private void StabAttack( float range, float radius )
 
 		if ( trace.Entity is Player player )
 		{
-			player.DistanceToAttacker = 0;
-
 			PlaySound( FleshHit );
 
 			if ( Backstabs && IsBehindAndFacingTarget( player ) )

code/Player/Player.Damage.cs

@@ -12,8 +12,6 @@ public partial class Player
 	[Net]
 	public TimeSince TimeSinceDeath { get; private set; }
 
-	public float DistanceToAttacker { get; set; }
-
 	/// <summary>
 	/// It's always better to use this than <see cref="Entity.LastAttackerWeapon"/>
 	/// because the weapon may be invalid.
@@ -181,8 +179,7 @@ public void SendDamageInfo( To to )
 			LastAttackerWeaponInfo,
 			LastDamage.Damage,
 			LastDamage.Tags?.ToArray(),
-			LastDamage.Position,
-			DistanceToAttacker
+			LastDamage.Position
 		);
 	}
 
@@ -221,7 +218,6 @@ private float GetBulletDamageMultipliers( DamageInfo info )
 
 	private void ResetDamageData()
 	{
-		DistanceToAttacker = 0;
 		LastAttacker = null;
 		LastAttackerWeapon = null;
 		LastAttackerWeaponInfo = null;
@@ -235,7 +231,7 @@ public static void Deafen( float strength )
 	}
 
 	[ClientRpc]
-	private void SendDamageInfo( Entity a, Entity w, CarriableInfo wI, float d, string[] tags, Vector3 p, float dTA )
+	private void SendDamageInfo( Entity a, Entity w, CarriableInfo wI, float d, string[] tags, Vector3 p)
 	{
 		var info = DamageInfo.Generic( 100f )
 			.WithAttacker( a )
@@ -244,7 +240,6 @@ private void SendDamageInfo( Entity a, Entity w, CarriableInfo wI, float d, stri
 
 		info.Tags = new HashSet<string>( tags ?? Array.Empty<string>() );
 
-		DistanceToAttacker = dTA;
 		LastAttacker = a;
 		LastAttackerWeapon = w;
 		LastAttackerWeaponInfo = wI;

code/UI/Player/RoleMenu/DNA/DNAMenu.cs

@@ -39,6 +39,6 @@ public static void SetAutoScan( bool enabled )
 
 	protected override int BuildHash()
 	{
-		return HashCode.Combine( _dnaScanner?.IsCharging, _dnaScanner?.SlotText, _dnaScanner?.DNACollected?.HashCombine( d => d.Id ), _dnaScanner.SelectedId );
+		return HashCode.Combine( _dnaScanner?.IsCharging, _dnaScanner?.SlotText, _dnaScanner?.DNACollected?.HashCombine( d => d.Id ), _dnaScanner?.SelectedId );
 	}
 }