Use EftBulletClass now

sailro · Jan 7, 2025 · 778eaa7 · 778eaa7
1 parent 4e2ffd7
commit 778eaa7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 38 deletions.
diff --git a/Features/Ammunition.cs b/Features/Ammunition.cs
@@ -2,7 +2,6 @@
 using Comfort.Common;
 using EFT.Ballistics;
 using EFT.InventoryLogic;
-using EFT.Trainer.Model;
 using EFT.Trainer.Properties;
 using JetBrains.Annotations;
 
@@ -19,21 +18,20 @@ internal class Ammunition : ToggleFeature
 	public override bool Enabled { get; set; } = false;
 
 	[UsedImplicitly]
-	private static void ShootPostfix(object shot)
+	private static void ShootPostfix(EftBulletClass shot)
 	{
 		var feature = FeatureFactory.GetFeature<Ammunition>();
 		if (feature == null || !feature.Enabled)
 			return;
 
-		var shotWrapper = new ShotWrapper(shot);
-		if (shotWrapper.Weapon is not Weapon weapon)
+		if (shot.Weapon is not Weapon weapon)
 			return;
 
-		var ammo = shotWrapper.Ammo;
+		var ammo = shot.Ammo;
 		if (ammo == null)
 			return;
 
-		var player = shotWrapper.Player;
+		var player = shot.Player.iPlayer;
 		if (player is not { IsYourPlayer: true })
 			return;
 
@@ -75,7 +73,7 @@ protected override void UpdateWhenEnabled()
 	{
 		HarmonyPatchOnce(harmony =>
 		{
-			HarmonyPostfix(harmony, typeof(BallisticsCalculator), nameof(BallisticsCalculator.Shoot), nameof(ShootPostfix));
+			HarmonyPostfix(harmony, typeof(BallisticsCalculator), nameof(BallisticsCalculator.Shoot), nameof(ShootPostfix), [typeof(EftBulletClass)]);
 		});
 	}
 }
diff --git a/Features/WallShoot.cs b/Features/WallShoot.cs
@@ -17,14 +17,13 @@ internal class WallShoot : ToggleFeature
 
 #pragma warning disable IDE0060
 	[UsedImplicitly]
-	protected static bool IsPenetratedPrefix(object shot, Vector3 hitPoint, BallisticCollider __instance, ref bool __result)
+	protected static bool IsPenetratedPrefix(EftBulletClass shot, Vector3 hitPoint, BallisticCollider __instance, ref bool __result)
 	{
 		var feature = FeatureFactory.GetFeature<WallShoot>();
 		if (feature == null || !feature.Enabled)
 			return true; // keep using original code, we are not enabled
 
-		var shotWrapper = new ShotWrapper(shot);
-		var player = shotWrapper.Player;
+		var player = shot.Player.iPlayer;
 		if (player is not { IsYourPlayer: true })
 			return true; // keep using original code for other players
 

diff --git a/Model/ShotWrapper.cs b/Model/ShotWrapper.cs
diff --git a/NLog.EFT.Trainer.csproj b/NLog.EFT.Trainer.csproj
@@ -219,7 +219,6 @@
     <Compile Include="Features\WorldInteractiveObjects.cs" />
     <Compile Include="Model\ReflectionWrapper.cs" />
     <Compile Include="Model\ActiveHealthControllerWrapper.cs" />
-    <Compile Include="Model\ShotWrapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Strings.fr.Designer.cs">
       <DependentUpon>Strings.fr.resx</DependentUpon>