PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-15 16:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable grief warning for splash damage against VR terminals

Browse source
This commit is contained in:
Subsonic154 2026-05-04 09:17:23 -04:00
parent efae7f6d8c
commit 0d2625d538
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/scala/net/psforever/actors/session/support/SessionData.scala
View file

@ -22,6 +22,7 @@ import net.psforever.objects.serverobject.mount.Mountable
import net.psforever.objects.serverobject.structures.Amenity import net.psforever.objects.serverobject.structures.Amenity
import net.psforever.objects.vehicles._ import net.psforever.objects.vehicles._
import net.psforever.objects.vital._ import net.psforever.objects.vital._
import net.psforever.objects.vital.base.DamageResolution
import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.interaction.DamageInteraction
import net.psforever.objects.zones._ import net.psforever.objects.zones._
import net.psforever.objects.zones.blockmap.{BlockMap, BlockMapEntity, SectorGroup, SectorPopulation} import net.psforever.objects.zones.blockmap.{BlockMap, BlockMapEntity, SectorGroup, SectorPopulation}
@ -461,7 +462,9 @@ class SessionData(
case obj: Amenity if obj.CanDamage => case obj: Amenity if obj.CanDamage =>
if (obj.IsInVRZone && obj.Faction == player.Faction) { if (obj.IsInVRZone && obj.Faction == player.Faction) {
//disable friendly-fire in VR zones //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 { } else {
obj.Actor ! Vitality.Damage(func) obj.Actor ! Vitality.Damage(func)
} }