PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-04-27 06:45:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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)))) sendResponse(CharacterKnowledgeMessage(charId, Some(CharacterKnowledgeInfo(name, certs, u1, u2, zone))))
case SquadResponse.SquadSearchResults(results) => case SquadResponse.SquadSearchResults(results) =>
//TODO positive squad search results message? //TODO positive squad search results message?
if(results.nonEmpty) { // if(results.nonEmpty) {
results.foreach { guid => // results.foreach { guid =>
sendResponse(SquadDefinitionActionMessage( // sendResponse(SquadDefinitionActionMessage(
guid, // guid,
0, // 0,
SquadAction.SquadListDecorator(SquadListDecoration.SearchResult)) // SquadAction.SquadListDecorator(SquadListDecoration.SearchResult))
) // )
} // }
} else { // } else {
sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.NoSquadSearchResults())) // sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.NoSquadSearchResults()))
} // }
sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.CancelSquadSearch())) // sendResponse(SquadDefinitionActionMessage(player.GUID, 0, SquadAction.CancelSquadSearch()))
case SquadResponse.InitWaypoints(char_id, waypoints) => case SquadResponse.InitWaypoints(char_id, waypoints) =>
waypoints.foreach { 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) //squads and members (users)
squadFeatures.foreach { squadFeatures.foreach {
case (_, features) => case (_, features) =>
CloseSquad(features.Squad) DisbandSquad(features)
} }
memberToSquad.clear() memberToSquad.clear()
publishedLists.clear() publishedLists.clear()
@ -686,10 +686,10 @@ class SquadService extends Actor {
} }
None None
case search: SearchForSquadsWithParticularRole => case search: SearchForSquadsWithParticularRole =>
SquadActionDefinitionSearchForSquadsWithParticularRole(tplayer, search) // SquadActionDefinitionSearchForSquadsWithParticularRole(tplayer, search)
None None
case _: CancelSquadSearch => case _: CancelSquadSearch =>
SquadActionDefinitionCancelSquadSearch(tplayer.CharId) // SquadActionDefinitionCancelSquadSearch(tplayer.CharId)
None None
case _: DisplaySquad => case _: DisplaySquad =>
GetSquad(guid) match { GetSquad(guid) match {