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

boomers are no longer owned if the trigger is dropped (how long has this been not working?)

Browse source
This commit is contained in:
Fate-JH 2024-05-25 00:54:24 -04:00
parent 445176006f
commit 82222d7c0b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/scala/net/psforever/objects/ce/DeployableBehavior.scala
View file

@ -69,7 +69,7 @@ trait DeployableBehavior {
if DeployableObject.OwnerGuid.nonEmpty =>
val obj = DeployableObject
if (constructed.contains(true)) {
loseOwnership(obj, obj.Faction)
loseOwnership(obj, PlanetSideEmpire.NEUTRAL)
} else {
obj.OwnerGuid = None
}
@ -103,9 +103,9 @@ trait DeployableBehavior {
* may also affect deployable operation
*/
def loseOwnership(obj: Deployable, toFaction: PlanetSideEmpire.Value): Unit = {
DeployableBehavior.changeOwership(
DeployableBehavior.changeOwnership(
obj,
obj.Faction,
toFaction,
DeployableInfo(obj.GUID, Deployable.Icon.apply(obj.Definition.Item), obj.Position, Service.defaultPlayerGUID)
)
startOwnerlessDecay()
@ -140,7 +140,7 @@ trait DeployableBehavior {
val obj = DeployableObject
obj.AssignOwnership(player)
decay.cancel()
DeployableBehavior.changeOwership(
DeployableBehavior.changeOwnership(
obj,
toFaction,
DeployableInfo(obj.GUID, Deployable.Icon.apply(obj.Definition.Item), obj.Position, obj.OwnerGuid.get)
@ -290,12 +290,12 @@ object DeployableBehavior {
* @param toFaction na
* @param info na
*/
def changeOwership(obj: Deployable, toFaction: PlanetSideEmpire.Value, info: DeployableInfo): Unit = {
val guid = obj.GUID
val zone = obj.Zone
val localEvents = zone.LocalEvents
def changeOwnership(obj: Deployable, toFaction: PlanetSideEmpire.Value, info: DeployableInfo): Unit = {
val originalFaction = obj.Faction
if (originalFaction != toFaction) {
val guid = obj.GUID
val zone = obj.Zone
val localEvents = zone.LocalEvents
obj.Faction = toFaction
//visual tells in regards to ownership by faction
zone.AvatarEvents ! AvatarServiceMessage(