From f448cad13f4962a7e76e0eaa1b117c5ca977ba5f Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Mon, 17 Apr 2023 11:26:14 -0400
Subject: [PATCH] Working BANK (#1061)

* making the bank ammunition actual bank ammunition

* this MatchError never happened before now; don't get it
---
 src/main/scala/net/psforever/actors/session/AvatarActor.scala   | 2 +-
 .../actors/session/support/SessionGalaxyHandlers.scala          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
index 565a39589..0889ce3a0 100644
--- a/src/main/scala/net/psforever/actors/session/AvatarActor.scala
+++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
@@ -298,7 +298,7 @@ object AvatarActor {
               }
               val fireMode = tool.AmmoSlots(ammoSlots)
               fireMode.AmmoTypeIndex = ammoTypeIndex
-              fireMode.Box = AmmoBox(AmmoBoxDefinition(ammoBoxDefinition))
+              fireMode.Box = AmmoBox(DefinitionUtil.idToDefinition(ammoBoxDefinition).asInstanceOf[AmmoBoxDefinition])
               ammoCount.collect {
                 case count if restoreAmmo => fireMode.Magazine = count
               }
diff --git a/src/main/scala/net/psforever/actors/session/support/SessionGalaxyHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionGalaxyHandlers.scala
index 9a0db54a0..976ee10fa 100644
--- a/src/main/scala/net/psforever/actors/session/support/SessionGalaxyHandlers.scala
+++ b/src/main/scala/net/psforever/actors/session/support/SessionGalaxyHandlers.scala
@@ -63,6 +63,8 @@ class SessionGalaxyHandlers(
 
       case GalaxyResponse.SendResponse(msg) =>
         sendResponse(msg)
+
+      case _ => ()
     }
   }
 }