From 4d3a3a390fcf68864aeb8ed9daaf7cedab6cd5bf Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Sun, 29 Jun 2025 15:58:47 -0400 Subject: [PATCH 1/3] max armor reminder, log kicked player --- .../net/psforever/actors/session/support/ZoningOperations.scala | 1 + .../psforever/services/account/AccountPersistenceService.scala | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala index 49bb0833c..514b7c3a6 100644 --- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala @@ -3134,6 +3134,7 @@ class ZoningOperations( statisticsPacketFunc() if (tplayer.ExoSuit == ExoSuitType.MAX) { sendResponse(PlanetsideAttributeMessage(guid, 7, tplayer.Capacitor.toLong)) + sendResponse(PlanetsideAttributeMessage(guid, 4, tplayer.Armor)) } // AvatarAwardMessage //populateAvatarAwardRibbonsFunc(1, 20L) diff --git a/src/main/scala/net/psforever/services/account/AccountPersistenceService.scala b/src/main/scala/net/psforever/services/account/AccountPersistenceService.scala index 1d2fe0f4f..3ff3206af 100644 --- a/src/main/scala/net/psforever/services/account/AccountPersistenceService.scala +++ b/src/main/scala/net/psforever/services/account/AccountPersistenceService.scala @@ -318,6 +318,7 @@ class PersistenceMonitor( } kicked = true kickTime = time.orElse(Some(300L)) + PerformLogout() case Logout(_) => kickTime match { From e76c33b0285f0536395878e796149880094b991e Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 30 Jun 2025 13:00:58 -0400 Subject: [PATCH 2/3] tell others my armor --- .../net/psforever/actors/session/support/ZoningOperations.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala index 514b7c3a6..f7efba70c 100644 --- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala @@ -3135,6 +3135,7 @@ class ZoningOperations( if (tplayer.ExoSuit == ExoSuitType.MAX) { sendResponse(PlanetsideAttributeMessage(guid, 7, tplayer.Capacitor.toLong)) sendResponse(PlanetsideAttributeMessage(guid, 4, tplayer.Armor)) + continent.AvatarEvents ! AvatarServiceMessage(continent.id, AvatarAction.PlanetsideAttributeToAll(guid, 4, tplayer.Armor)) } // AvatarAwardMessage //populateAvatarAwardRibbonsFunc(1, 20L) From e3231bae022784f477fa81b9eb5c7b6d983769d4 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 30 Jun 2025 20:28:16 -0400 Subject: [PATCH 3/3] tell me armor for any max --- .../net/psforever/actors/session/support/ZoningOperations.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala index f7efba70c..3cb7d7643 100644 --- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala @@ -3137,6 +3137,8 @@ class ZoningOperations( 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 //populateAvatarAwardRibbonsFunc(1, 20L)