PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

no search

Browse source
This commit is contained in:
ScrawnyRonnie 2024-01-07 20:43:56 -05:00
parent 69b5dec127
commit 892cd376bc
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/scala/net/psforever/actors/session/support/SessionSquadHandlers.scala
View file

@ -336,19 +336,19 @@ class SessionSquadHandlers(
sendResponse(CharacterKnowledgeMessage(charId, Some(CharacterKnowledgeInfo(name, certs, u1, u2, zone))))
case SquadResponse.SquadSearchResults(results) =>
//TODO positive squad search results message?
if(results.nonEmpty) {
results.foreach { guid =>
sendResponse(SquadDefinitionActionMessage(
guid,
0,
SquadAction.SquadListDecorator(SquadListDecoration.SearchResult))
)
}
} else {
sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.NoSquadSearchResults()))
}
sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.CancelSquadSearch()))
//TODO positive squad search results message?
// if(results.nonEmpty) {
// results.foreach { guid =>
// sendResponse(SquadDefinitionActionMessage(
// guid,
// 0,
// SquadAction.SquadListDecorator(SquadListDecoration.SearchResult))
// )
// }
// } else {
// sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.NoSquadSearchResults()))
// }
// sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.CancelSquadSearch()))
case SquadResponse.InitWaypoints(char_id, waypoints) =>
waypoints.foreach {

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

@ -76,7 +76,7 @@ class SquadService extends Actor {
//squads and members (users)
squadFeatures.foreach {
case (_, features) =>
CloseSquad(features.Squad)
DisbandSquad(features)
}
memberToSquad.clear()
publishedLists.clear()
@ -686,10 +686,10 @@ class SquadService extends Actor {
}
None
case search: SearchForSquadsWithParticularRole =>
SquadActionDefinitionSearchForSquadsWithParticularRole(tplayer, search)
// SquadActionDefinitionSearchForSquadsWithParticularRole(tplayer, search)
None
case _: CancelSquadSearch =>
SquadActionDefinitionCancelSquadSearch(tplayer.CharId)
// SquadActionDefinitionCancelSquadSearch(tplayer.CharId)
None
case _: DisplaySquad =>
GetSquad(guid) match {