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

console?

Browse source
This commit is contained in:
ScrawnyRonnie 2024-01-08 20:36:38 -05:00
parent 892cd376bc
commit bcb3c43211
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/scala/net/psforever/services/teamwork/SquadService.scala
View file

@ -974,7 +974,6 @@ class SquadService extends Actor {
def CloseSquad(squad: Squad): Unit = {
val guid = squad.GUID
val membership = squad.Membership.zipWithIndex
val factionListings = publishedLists(squad.Faction)
val (updateMembers, updateIndices) = membership.collect {
case (member, index) if member.CharId > 0 =>
((member, member.CharId, index, subs.UserEvents.get(member.CharId)), (member.CharId, index))
@ -1011,15 +1010,12 @@ class SquadService extends Actor {
subs.Publish(charId, SquadResponse.Detail(PlanetSideGUID(0), completelyBlankSquadDetail))
}
UpdateSquadListWhenListed(features.Stop, None)
//I think this is right, otherwise squadFeatures will never be empty and TryResetSquadId will not reset to 1
squadFeatures.remove(guid)
//for the rare case of a phantom squad that no longer exists but is still on the publishedLists
factionListings.find(_ == guid) match {
case Some(squad) =>
val index = factionListings.indexOf(squad)
factionListings.remove(index)
case None =>
}
squadFeatures -= guid
//really make sure it is removed
publishedLists(squad.Faction) -= guid
//testing
println(s"AllSquads Removed: $guid - Remaining: $squadFeatures")
println(s"ListedSquads: $publishedLists")
}
/**