From fdec30bea0582583744aa2e049f590956694ea0a Mon Sep 17 00:00:00 2001
From: Subsonic154 <subsonicgamingbeatz415@gmail.com>
Date: Mon, 4 May 2026 16:22:25 -0400
Subject: [PATCH] Remove VR friendly-fire invulnerability from deployables

---
 .../psforever/actors/session/support/SessionData.scala   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/support/SessionData.scala b/src/main/scala/net/psforever/actors/session/support/SessionData.scala
index b1b4d4f82..ef4a2daa4 100644
--- a/src/main/scala/net/psforever/actors/session/support/SessionData.scala
+++ b/src/main/scala/net/psforever/actors/session/support/SessionData.scala
@@ -477,14 +477,7 @@ class SessionData(
         } else {
           log.info(s"$name is attacking $ownerName's ${obj.Definition.Name}")
         }
-        if (obj.IsInVRZone && obj.Faction == player.Faction) {
-          //disable friendly-fire in VR zones
-          if (!ownerName.equals(name)) {
-            general.trainingGriefWarning()
-          }
-        } else {
-          obj.Actor ! Vitality.Damage(func)
-        }
+        obj.Actor ! Vitality.Damage(func)
 
       case _ => ()
     }