From 0d2625d5383f95d790d44dc13cab7a17f7dfa80d Mon Sep 17 00:00:00 2001 From: Subsonic154 Date: Mon, 4 May 2026 09:17:23 -0400 Subject: [PATCH] Disable grief warning for splash damage against VR terminals --- .../net/psforever/actors/session/support/SessionData.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 3af1b649b..b1b4d4f82 100644 --- a/src/main/scala/net/psforever/actors/session/support/SessionData.scala +++ b/src/main/scala/net/psforever/actors/session/support/SessionData.scala @@ -22,6 +22,7 @@ import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.serverobject.structures.Amenity import net.psforever.objects.vehicles._ import net.psforever.objects.vital._ +import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.zones._ import net.psforever.objects.zones.blockmap.{BlockMap, BlockMapEntity, SectorGroup, SectorPopulation} @@ -461,7 +462,9 @@ class SessionData( case obj: Amenity if obj.CanDamage => if (obj.IsInVRZone && obj.Faction == player.Faction) { //disable friendly-fire in VR zones - general.trainingGriefWarning() + if (data.resolution != DamageResolution.Splash) { //don't do the grief warning against amenities from splash damage + general.trainingGriefWarning() + } } else { obj.Actor ! Vitality.Damage(func) }