PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

only the dying person has their implants deinitialize (#1224)

Browse source
This commit is contained in:
Fate-JH 2024-08-06 23:37:26 -04:00 committed by GitHub
parent 46ad7148a2
commit d2d7c2e09b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/scala/net/psforever/actors/session/AvatarActor.scala
View file

@ -3520,11 +3520,7 @@ class AvatarActor(
} }
private def startReinitializeImplant(implant: Implant, slot: Int): Implant = { private def startReinitializeImplant(implant: Implant, slot: Int): Implant = {
//deinitialize sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Initialization, slot, value = 0)
session.get.zone.AvatarEvents ! AvatarServiceMessage(
session.get.zone.id,
AvatarAction.AvatarImplant(session.get.player.GUID, ImplantAction.Initialization, slot, 0)
)
startInitializeImplant(AvatarActor.initializationTime(implant))(implant, slot) startInitializeImplant(AvatarActor.initializationTime(implant))(implant, slot)
} }
@ -3580,10 +3576,7 @@ class AvatarActor(
private def deinitializeImplant(implant: Implant, slot: Int): Implant = { private def deinitializeImplant(implant: Implant, slot: Int): Implant = {
val outImplant = stopImplantInitializationTimer(implant, slot) val outImplant = stopImplantInitializationTimer(implant, slot)
session.get.zone.AvatarEvents ! AvatarServiceMessage( sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Initialization, slot, value = 0)
session.get.zone.id,
AvatarAction.AvatarImplant(session.get.player.GUID, ImplantAction.Initialization, slot, 0)
)
outImplant outImplant
} }
@ -3752,10 +3745,12 @@ class AvatarActor(
private def activateImplantPackets(implant: Implant, slot: Int): Unit = { private def activateImplantPackets(implant: Implant, slot: Int): Unit = {
sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Activation, slot, value = 1) sendAvatarImplantMessageToSelf(session.get.player.GUID, ImplantAction.Activation, slot, value = 1)
// Activation sound / effect // Activation sound / effect
session.get.zone.AvatarEvents ! AvatarServiceMessage( val sess = session.get
session.get.zone.id, val zone = sess.zone
zone.AvatarEvents ! AvatarServiceMessage(
zone.id,
AvatarAction.PlanetsideAttribute( AvatarAction.PlanetsideAttribute(
session.get.player.GUID, sess.player.GUID,
28, 28,
implant.definition.implantType.value * 2 + 1 implant.definition.implantType.value * 2 + 1
) )