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

force spit sideness

Browse source
This commit is contained in:
ScrawnyRonnie 2025-05-26 21:01:22 -04:00
parent a1b7fe01ff
commit 2f2fcd94f1
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala
View file

@ -18,6 +18,7 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity
import net.psforever.objects.serverobject.containable.Containable import net.psforever.objects.serverobject.containable.Containable
import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.doors.Door
import net.psforever.objects.serverobject.generator.Generator import net.psforever.objects.serverobject.generator.Generator
import net.psforever.objects.serverobject.interior.Sidedness.OutsideOf
import net.psforever.objects.serverobject.llu.CaptureFlag import net.psforever.objects.serverobject.llu.CaptureFlag
import net.psforever.objects.serverobject.locks.IFFLock import net.psforever.objects.serverobject.locks.IFFLock
import net.psforever.objects.serverobject.mblocker.Locker import net.psforever.objects.serverobject.mblocker.Locker
@ -406,7 +407,12 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex
} }
log.info(s"${player.Name} is constructing a $ammoType deployable") log.info(s"${player.Name} is constructing a $ammoType deployable")
sessionLogic.zoning.CancelZoningProcessWithDescriptiveReason("cancel_use") sessionLogic.zoning.CancelZoningProcessWithDescriptiveReason("cancel_use")
ops.handleDeployObject(continent, ammoType, pos, orient, player.WhichSide, player.Faction, player, obj) if (obj.AmmoType == DeployedItem.spitfire_turret || obj.AmmoType == DeployedItem.spitfire_cloaked) {
ops.handleDeployObject(continent, ammoType, pos, orient, OutsideOf, player.Faction, player, obj)
}
else {
ops.handleDeployObject(continent, ammoType, pos, orient, player.WhichSide, player.Faction, player, obj)
}
case Some(obj) => case Some(obj) =>
log.warn(s"DeployObject: what is $obj, ${player.Name}? It's not a construction tool!") log.warn(s"DeployObject: what is $obj, ${player.Name}? It's not a construction tool!")
case None => case None =>

2
src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala
View file

@ -65,7 +65,7 @@ class WithEntrance()
obj: InteractsWithZone, obj: InteractsWithZone,
door: Door door: Door
): Sidedness = { ): Sidedness = {
debugInteriorCheck(obj, door) //debugInteriorCheck(obj, door)
strictInteriorCheck(obj, door) strictInteriorCheck(obj, door)
} }