From d2d7c2e09bbfb71b301100e5ef6c615acb2f647b Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Tue, 6 Aug 2024 23:37:26 -0400 Subject: [PATCH] only the dying person has their implants deinitialize (#1224) --- .../actors/session/AvatarActor.scala | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala index 311564d0..8a243b6d 100644 --- a/src/main/scala/net/psforever/actors/session/AvatarActor.scala +++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala @@ -3520,11 +3520,7 @@ class AvatarActor( } private def startReinitializeImplant(implant: Implant, slot: Int): Implant = { - //deinitialize - session.get.zone.AvatarEvents ! AvatarServiceMessage( - session.get.zone.id, - AvatarAction.AvatarImplant(session.get.player.GUID, ImplantAction.Initialization, slot, 0) - ) + sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Initialization, slot, value = 0) startInitializeImplant(AvatarActor.initializationTime(implant))(implant, slot) } @@ -3580,10 +3576,7 @@ class AvatarActor( private def deinitializeImplant(implant: Implant, slot: Int): Implant = { val outImplant = stopImplantInitializationTimer(implant, slot) - session.get.zone.AvatarEvents ! AvatarServiceMessage( - session.get.zone.id, - AvatarAction.AvatarImplant(session.get.player.GUID, ImplantAction.Initialization, slot, 0) - ) + sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Initialization, slot, value = 0) outImplant } @@ -3752,10 +3745,12 @@ class AvatarActor( private def activateImplantPackets(implant: Implant, slot: Int): Unit = { sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Activation, slot, value = 1) // Activation sound / effect - session.get.zone.AvatarEvents ! AvatarServiceMessage( - session.get.zone.id, + val sess = session.get + val zone = sess.zone + zone.AvatarEvents ! AvatarServiceMessage( + zone.id, AvatarAction.PlanetsideAttribute( - session.get.player.GUID, + sess.player.GUID, 28, implant.definition.implantType.value * 2 + 1 )