PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for hackable entities not resetting their hack state when resecured by the empire that owns the hackable (#238)

Browse source
This commit is contained in:
Mazo 2018-11-22 01:02:41 +00:00 committed by Fate-JH
parent 6445883ccf
commit 7cec0bb577
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala
View file

@ -1,10 +1,11 @@
package net.psforever.objects.serverobject.hackable
import net.psforever.objects.Player
import net.psforever.objects.serverobject.affinity.FactionAffinity
import net.psforever.packet.game.{PlanetSideGUID, TriggeredSound}
import net.psforever.types.Vector3
trait Hackable {
trait Hackable extends FactionAffinity {
/** An entry that maintains a reference to the `Player`, and the player's GUID and location when the message was received. */
private var hackedBy : Option[(Player, PlanetSideGUID, Vector3)] = None
def HackedBy : Option[(Player, PlanetSideGUID, Vector3)] = hackedBy
@ -24,8 +25,8 @@ trait Hackable {
hackedBy = Some(agent.get, agent.get.GUID, agent.get.Position)
}
case Some(_) =>
//clear the hack state
if(agent.isEmpty) {
//clear the hack state if no agent is provided or the agent's faction matches the object faction
if(agent.isEmpty || agent.get.Faction == this.Faction) {
hackedBy = None
}
//override the hack state with a new hack state if the new user has different faction affiliation