From 892cd376bc3ebe562229694f6f1637cdccf20bf3 Mon Sep 17 00:00:00 2001
From: ScrawnyRonnie <scrawnyronniebbac@yahoo.com>
Date: Sun, 7 Jan 2024 20:43:56 -0500
Subject: [PATCH] no search

---
 .../support/SessionSquadHandlers.scala        | 26 +++++++++----------
 .../services/teamwork/SquadService.scala      |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/support/SessionSquadHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionSquadHandlers.scala
index 132924a16..e3ff2bb0e 100644
--- a/src/main/scala/net/psforever/actors/session/support/SessionSquadHandlers.scala
+++ b/src/main/scala/net/psforever/actors/session/support/SessionSquadHandlers.scala
@@ -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 {
diff --git a/src/main/scala/net/psforever/services/teamwork/SquadService.scala b/src/main/scala/net/psforever/services/teamwork/SquadService.scala
index f52b4323e..932105217 100644
--- a/src/main/scala/net/psforever/services/teamwork/SquadService.scala
+++ b/src/main/scala/net/psforever/services/teamwork/SquadService.scala
@@ -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 {