From 42726fded298910b07c34cf6e5713933e5fd4dcc Mon Sep 17 00:00:00 2001
From: Subsonic154 <subsonicgamingbeatz415@gmail.com>
Date: Tue, 5 May 2026 11:30:34 -0400
Subject: [PATCH] Disable friendly-fire warning for amenities in VR

---
 .../net/psforever/actors/session/support/SessionData.scala     | 3 ---
 1 file changed, 3 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 ef4a2daa4..c72427aa3 100644
--- a/src/main/scala/net/psforever/actors/session/support/SessionData.scala
+++ b/src/main/scala/net/psforever/actors/session/support/SessionData.scala
@@ -462,9 +462,6 @@ class SessionData(
       case obj: Amenity if obj.CanDamage =>
         if (obj.IsInVRZone && obj.Faction == player.Faction) {
           //disable friendly-fire in VR zones
-          if (data.resolution != DamageResolution.Splash) { //don't do the grief warning against amenities from splash damage
-            general.trainingGriefWarning()
-          }
         } else {
           obj.Actor ! Vitality.Damage(func)
         }