PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

packet order

Browse source
This commit is contained in:
ScrawnyRonnie 2025-07-20 07:48:13 -04:00
parent 3055f73a68
commit 198f4cebb9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala
View file

@ -309,15 +309,15 @@ class WeaponAndProjectileOperations(
avatarActor ! AvatarActor.UpdateCUDTime("reveal_friendlies")
sendResponse(UplinkPositionEvent(5, Event0(5)))
sendResponse(UplinkPositionEvent(4, Event1(4, revealZone)))
sendResponse(UplinkPositionEvent(6, Event0(6)))
val friendlies = player.Zone.LivePlayers.filter { friend => friend.Faction == player.Faction }
val friendlyVehicles = player.Zone.Vehicles.filter { vehicle => vehicle.Faction == player.Faction && !vehicle.Destroyed }
friendlies.foreach { f =>
sendResponse(UplinkPositionEvent(0, Event2(0, Vector3(f.Position.x, f.Position.y, 0.0f), 255, revealZone, 0, 1118938442, 300000, 299080, Some(true))))
sendResponse(UplinkPositionEvent(0, Event2(0, Vector3(f.Position.x, f.Position.y, 0.0f), 255, revealZone, 0, 1127348721, 300000, 298858, Some(true))))
}
friendlyVehicles.foreach { v =>
sendResponse(UplinkPositionEvent(0, Event2(0, Vector3(v.Position.x, v.Position.y, 0.0f), v.Definition.MapRevealId, revealZone, 0, 1118938442, 300000, 299080, Some(true))))
sendResponse(UplinkPositionEvent(0, Event2(0, Vector3(v.Position.x, v.Position.y, 0.0f), v.Definition.MapRevealId, revealZone, 0, 1127348721, 300000, 298858, Some(true))))
}
sendResponse(UplinkPositionEvent(6, Event0(6)))
case UplinkRequestType.RevealEnemies =>
val revealZone = player.Zone.Number
sendResponse(UplinkResponse(code.value, 0))
@ -325,7 +325,6 @@ class WeaponAndProjectileOperations(
avatarActor ! AvatarActor.UpdateCUDTime("reveal_enemies")
sendResponse(UplinkPositionEvent(5, Event0(5)))
sendResponse(UplinkPositionEvent(4, Event1(4, revealZone)))
sendResponse(UplinkPositionEvent(6, Event0(6)))
val enemies = player.Zone.LivePlayers.filter { enemy => enemy.Faction != player.Faction &&
Zone.orbitalStrikeDistanceCheck(player.Position, enemy.Position, 200f)} //reusing distance check
val enemyVehicles = player.Zone.Vehicles.filter { vehicle => vehicle.Faction != player.Faction && !vehicle.Destroyed &&
@ -336,6 +335,7 @@ class WeaponAndProjectileOperations(
enemyVehicles.foreach { v =>
sendResponse(UplinkPositionEvent(1, Event2(1, Vector3(v.Position.x, v.Position.y, 0.0f), v.Definition.MapRevealId, revealZone, 0, 1118938442, 300000, 299080, Some(false))))
}
sendResponse(UplinkPositionEvent(6, Event0(6)))
case UplinkRequestType.ElectroMagneticPulse =>
val cr = player.avatar.cr.value
val empSize = cr match {