From 8bddbd6b50e20ccef165b25827e3eafbb815f39f Mon Sep 17 00:00:00 2001
From: zoesklair <zoe.sklair1@virginmedia.com>
Date: Sat, 21 Mar 2026 23:19:34 +0000
Subject: [PATCH 1/2] prevent counterattacking own grenade

prevented counterattacking own grenade, used CompareTag instead of equals operator, and added VS files to .gitignore
---
 .gitignore                             |  4 ++++
 Assets/src/GrenadeExplodesAfterTime.cs | 12 ++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e9a57f2..56db6720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,7 @@ vendor.zip
 /Assets/StreamingAssets*
 /FMOD/.*
 fmod_editor.log
+
+# Visual Studio generated files
+.vs/
+.vsconfig
diff --git a/Assets/src/GrenadeExplodesAfterTime.cs b/Assets/src/GrenadeExplodesAfterTime.cs
index 92c0bb8a..f727f80a 100644
--- a/Assets/src/GrenadeExplodesAfterTime.cs
+++ b/Assets/src/GrenadeExplodesAfterTime.cs
@@ -49,24 +49,20 @@ private void Explode() {
       damage: WaitingToThrow() ? DamageExplodingInHand : BulletData.Damage,
       origin: transform.position,
       radius: Radius,
-      canBeCounterAttacked: true,
+      canBeCounterAttacked: !BulletData.Originator.transform.IsChildOf(PlayerGameObject.Current.transform),
       isDestructive: IsDestructive,
       damageCurve: DamageCurve,
       shouldDamage: (go) => {
-        if (!DamagesPlayer && go.tag == "Player")
+        if (!DamagesPlayer && go.CompareTag("Player"))
           return false;
-        if (!DamagesEnemies && go.tag == "Enemy")
+        if (!DamagesEnemies && go.CompareTag("Enemy"))
           return false;
         return true;
       }
     );
 
     // Send grenade back to originator on counterattack
-    if (
-      isCounterAttack
-      && BulletData.Originator
-      && BulletData.Originator != PlayerGameObject.Current
-    ) {
+    if (isCounterAttack && BulletData.Originator) {
       Vector3 toOriginator = (BulletData.Originator.transform.position - transform.position);
       Rigidbody.velocity = toOriginator * VelocityCoefficient;
       DamagesEnemies = true;

From 80d717e4de97fa60ac3f89f83d811f97c55921e8 Mon Sep 17 00:00:00 2001
From: zoesklair <zoe.sklair1@virginmedia.com>
Date: Sat, 21 Mar 2026 23:25:18 +0000
Subject: [PATCH 2/2] lint fix

---
 Assets/src/GrenadeExplodesAfterTime.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Assets/src/GrenadeExplodesAfterTime.cs b/Assets/src/GrenadeExplodesAfterTime.cs
index f727f80a..cea2cd35 100644
--- a/Assets/src/GrenadeExplodesAfterTime.cs
+++ b/Assets/src/GrenadeExplodesAfterTime.cs
@@ -49,7 +49,9 @@ private void Explode() {
       damage: WaitingToThrow() ? DamageExplodingInHand : BulletData.Damage,
       origin: transform.position,
       radius: Radius,
-      canBeCounterAttacked: !BulletData.Originator.transform.IsChildOf(PlayerGameObject.Current.transform),
+      canBeCounterAttacked: !BulletData.Originator.transform.IsChildOf(
+        PlayerGameObject.Current.transform
+      ),
       isDestructive: IsDestructive,
       damageCurve: DamageCurve,
       shouldDamage: (go) => {