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

Merge pull request #1277 from ScrawnyRonnie/max-armor

Browse source 
Two Little Fixes
This commit is contained in:
ScrawnyRonnie 2025-07-04 13:06:46 -04:00 • committed by GitHub
commit a3a57b1e4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
View file

@ -3134,7 +3134,11 @@ class ZoningOperations(
statisticsPacketFunc() statisticsPacketFunc()
if (tplayer.ExoSuit == ExoSuitType.MAX) { if (tplayer.ExoSuit == ExoSuitType.MAX) {
sendResponse(PlanetsideAttributeMessage(guid, 7, tplayer.Capacitor.toLong)) sendResponse(PlanetsideAttributeMessage(guid, 7, tplayer.Capacitor.toLong))
sendResponse(PlanetsideAttributeMessage(guid, 4, tplayer.Armor))
continent.AvatarEvents ! AvatarServiceMessage(continent.id, AvatarAction.PlanetsideAttributeToAll(guid, 4, tplayer.Armor))
} }
// for issue #1269
continent.AllPlayers.filter(_.ExoSuit == ExoSuitType.MAX).foreach(max => sendResponse(PlanetsideAttributeMessage(max.GUID, 4, max.Armor)))
// AvatarAwardMessage // AvatarAwardMessage
//populateAvatarAwardRibbonsFunc(1, 20L) //populateAvatarAwardRibbonsFunc(1, 20L)

1
src/main/scala/net/psforever/services/account/AccountPersistenceService.scala
View file

@ -318,6 +318,7 @@ class PersistenceMonitor(
} }
kicked = true kicked = true
kickTime = time.orElse(Some(300L)) kickTime = time.orElse(Some(300L))
PerformLogout()
case Logout(_) => case Logout(_) =>
kickTime match { kickTime match {