PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-15 00:14:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow EMPs to disable implants & force reinitialization, and fix a load of silly cases of packets going to the wrong clients. (#356)

Browse source
This commit is contained in:
Mazo 2020-04-16 23:35:46 +01:00 • committed by GitHub
parent 7f402ac171
commit a479305e77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -94,7 +94,7 @@ class PlayerControl(player : Player) extends Actor
} }
// Start client side initialization timer // Start client side initialization timer
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.SendResponse(player.GUID, ActionProgressMessage(slot + 6, 0))) player.Zone.AvatarEvents ! AvatarServiceMessage(player.Name, AvatarAction.SendResponse(player.GUID, ActionProgressMessage(slot + 6, 0)))
// Callback after initialization timer to complete initialization // Callback after initialization timer to complete initialization
implantSlot.InitializeTimer = context.system.scheduler.scheduleOnce(implantSlot.MaxTimer seconds, self, Player.ImplantInitializationComplete(slot)) implantSlot.InitializeTimer = context.system.scheduler.scheduleOnce(implantSlot.MaxTimer seconds, self, Player.ImplantInitializationComplete(slot))
@ -103,9 +103,12 @@ class PlayerControl(player : Player) extends Actor
case Player.ImplantInitializationComplete(slot: Int) => case Player.ImplantInitializationComplete(slot: Int) =>
val implantSlot = player.ImplantSlot(slot) val implantSlot = player.ImplantSlot(slot)
if(implantSlot.Installed.isDefined) { if(implantSlot.Installed.isDefined) {
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.SendResponse(player.GUID, AvatarImplantMessage(player.GUID, ImplantAction.Initialization, slot, 1))) player.Zone.AvatarEvents ! AvatarServiceMessage(player.Name, AvatarAction.SendResponse(player.GUID, AvatarImplantMessage(player.GUID, ImplantAction.Initialization, slot, 1)))
implantSlot.Initialized = true implantSlot.Initialized = true
implantSlot.InitializeTimer = DefaultCancellable.obj if(implantSlot.InitializeTimer != DefaultCancellable.obj) {
implantSlot.InitializeTimer.cancel()
implantSlot.InitializeTimer = DefaultCancellable.obj
}
} }
case Player.DrainStamina(amount : Int) => case Player.DrainStamina(amount : Int) =>
@ -253,13 +256,26 @@ class PlayerControl(player : Player) extends Actor
val zone = obj.Zone val zone = obj.Zone
val zoneId = zone.Id val zoneId = zone.Id
val events = zone.AvatarEvents val events = zone.AvatarEvents
events ! AvatarServiceMessage(zoneId, AvatarAction.DeactivateImplantSlot(guid, 1))
events ! AvatarServiceMessage(zoneId, AvatarAction.DeactivateImplantSlot(guid, 2)) for(slot <- 0 to player.Implants.length - 1) { // Deactivate & uninitialize all implants
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, player.Implant(slot).id * 2)) // Deactivation sound / effect
events ! AvatarServiceMessage(player.Name, AvatarAction.DeactivateImplantSlot(guid, slot))
PlayerControl.UninitializeImplant(player, slot)
}
obj.skipStaminaRegenForTurns = math.max(obj.skipStaminaRegenForTurns, 10) obj.skipStaminaRegenForTurns = math.max(obj.skipStaminaRegenForTurns, 10)
super.StartJammeredStatus(target, dur) super.StartJammeredStatus(target, dur)
case _ => ; case _ => ;
} }
override def CancelJammeredStatus(target: Any): Unit = {
for(slot <- 0 to player.Implants.length - 1) { // Start reinitializing all implants
self ! Player.ImplantInitializationStart(slot)
}
super.CancelJammeredStatus(target)
}
/** /**
* Stop the jammered buzzing. * Stop the jammered buzzing.
* @see `JammableBehavior.CancelJammeredSound` * @see `JammableBehavior.CancelJammeredSound`
@ -442,6 +458,10 @@ object PlayerControl {
val implantSlot = player.ImplantSlot(slot) val implantSlot = player.ImplantSlot(slot)
implantSlot.Initialized = false implantSlot.Initialized = false
if(implantSlot.InitializeTimer != DefaultCancellable.obj) {
implantSlot.InitializeTimer.cancel()
implantSlot.InitializeTimer = DefaultCancellable.obj
}
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.SendResponse(player.GUID, AvatarImplantMessage(player.GUID, ImplantAction.Initialization, slot, 0))) player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.SendResponse(player.GUID, AvatarImplantMessage(player.GUID, ImplantAction.Initialization, slot, 0)))
} }
} }