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

some data sterilizing

Browse source
This commit is contained in:
Fate-JH 2023-03-17 02:39:19 -04:00
parent a49a485222
commit a8f488b00f
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala
View file

@ -72,6 +72,7 @@ class SessionAvatarHandlers(
spectating, spectating,
canSeeReallyFar canSeeReallyFar
) if isNotSameTarget => ) if isNotSameTarget =>
val pstateToSave = pstate.copy(timestamp = 0)
val (lastMsg, lastTime, lastPosition, wasSpectating) = lastSeenStreamMessage(guid.guid) match { val (lastMsg, lastTime, lastPosition, wasSpectating) = lastSeenStreamMessage(guid.guid) match {
case SessionAvatarHandlers.LastUpstream(Some(msg), time) => (Some(msg), time, msg.pos, msg.spectator) case SessionAvatarHandlers.LastUpstream(Some(msg), time) => (Some(msg), time, msg.pos, msg.spectator)
case _ => (None, 0L, Vector3.Zero, false) case _ => (None, 0L, Vector3.Zero, false)
@ -84,7 +85,7 @@ class SessionAvatarHandlers(
val wasInVisibleRange = Vector3.DistanceSquared(lastPosition, pos) <= maxRange val wasInVisibleRange = Vector3.DistanceSquared(lastPosition, pos) <= maxRange
val now = System.currentTimeMillis() //ms val now = System.currentTimeMillis() //ms
val durationSince = now - lastTime //ms val durationSince = now - lastTime //ms
if ((!spectating && inVisibleRange && !lastMsg.contains(reply)) || if ((!spectating && inVisibleRange && !lastMsg.contains(pstateToSave)) ||
(inVisibleRange && wasSpectating && !spectating)) { //this condition is unlikely, but ... (inVisibleRange && wasSpectating && !spectating)) { //this condition is unlikely, but ...
lazy val targetDelay = { lazy val targetDelay = {
val populationOver = math.max( val populationOver = math.max(
@ -119,9 +120,9 @@ class SessionAvatarHandlers(
isCloaking isCloaking
) )
) )
lastSeenStreamMessage(guid.guid) = SessionAvatarHandlers.LastUpstream(Some(pstate), now) lastSeenStreamMessage(guid.guid) = SessionAvatarHandlers.LastUpstream(Some(pstateToSave), now)
} else { } else {
lastSeenStreamMessage(guid.guid) = SessionAvatarHandlers.LastUpstream(Some(pstate), lastTime) lastSeenStreamMessage(guid.guid) = SessionAvatarHandlers.LastUpstream(Some(pstateToSave), lastTime)
} }
} else if ( } else if (
(inVisibleRange && !wasSpectating && spectating) || (inVisibleRange && !wasSpectating && spectating) ||
@ -140,7 +141,7 @@ class SessionAvatarHandlers(
is_cloaked = isCloaking is_cloaked = isCloaking
) )
) )
lastSeenStreamMessage(guid.guid) = SessionAvatarHandlers.LastUpstream(Some(pstate), now) lastSeenStreamMessage(guid.guid) = SessionAvatarHandlers.LastUpstream(Some(pstateToSave), now)
} }
case AvatarResponse.ObjectHeld(slot, _) case AvatarResponse.ObjectHeld(slot, _)