From 6cc6a663f5f99f05b309e9333e334ca6685247b2 Mon Sep 17 00:00:00 2001
From: Mazo <mazo2@hotmail.com>
Date: Sun, 6 Oct 2019 19:00:28 +0100
Subject: [PATCH] Fix for implants causing map loading hang (#275)

---
 .../definition/converter/AvatarConverter.scala    | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
index a141529c2..65c47dc23 100644
--- a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
+++ b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
@@ -243,17 +243,10 @@ object AvatarConverter {
     */
   private def MakeImplantEffectList(implants : Seq[(ImplantType.Value, Long, Boolean)]) : List[ImplantEffects.Value] = {
     implants.collect {
-      case (implant,_,true) =>
-        implant match {
-          case ImplantType.AdvancedRegen =>
-            ImplantEffects.RegenEffects
-          case ImplantType.DarklightVision =>
-            ImplantEffects.DarklightEffects
-          case ImplantType.PersonalShield =>
-            ImplantEffects.PersonalShieldEffects
-          case ImplantType.Surge =>
-            ImplantEffects.SurgeEffects
-        }
+      case (ImplantType.AdvancedRegen,_,true) => ImplantEffects.RegenEffects
+      case (ImplantType.DarklightVision,_,true) => ImplantEffects.DarklightEffects
+      case (ImplantType.PersonalShield,_,true) => ImplantEffects.PersonalShieldEffects
+      case (ImplantType.Surge,_,true) => ImplantEffects.SurgeEffects
     }.toList
   }