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

Facility Hack Timer #1314 from ScrawnyRonnie/hack-timer
Some checks failed
Publish Docs / docs (push) Has been cancelled
Details
Publish Docker Image / docker (push) Has been cancelled
Details
Test / test (push) Has been cancelled
Details

Browse source 
Different LLU Facility Hack Timer
This commit is contained in:
ScrawnyRonnie 2025-11-19 08:35:46 -05:00 committed by GitHub
parent a0ddec6872 5d8d55c482
commit 9646b3f99e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -833,7 +833,7 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex
pkt match { pkt match {
case OutfitRequest(_, OutfitRequestAction.Motd(message)) => case OutfitRequest(_, OutfitRequestAction.Motd(message)) =>
SessionOutfitHandlers.HandleOutfitMotd(zones, message, player) //SessionOutfitHandlers.HandleOutfitMotd(zones, message, player)
case OutfitRequest(_, OutfitRequestAction.Ranks(List(r1, r2, r3, r4, r5, r6, r7, r8))) => case OutfitRequest(_, OutfitRequestAction.Ranks(List(r1, r2, r3, r4, r5, r6, r7, r8))) =>
SessionOutfitHandlers.HandleOutfitRank(zones, List(r1, r2, r3, r4, r5, r6, r7, r8), player) SessionOutfitHandlers.HandleOutfitRank(zones, List(r1, r2, r3, r4, r5, r6, r7, r8), player)

8
src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala
View file

@ -41,7 +41,13 @@ class HackCaptureActor extends Actor {
case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) => case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) =>
log.trace(s"StartCaptureTerminalHack: ${target.GUID} is hacked") log.trace(s"StartCaptureTerminalHack: ${target.GUID} is hacked")
val duration = target.Definition.FacilityHackTime val hackingFaction = HackCaptureActor.GetHackingFaction(target).get
val duration = target.Owner match {
case b: Building if b.IsCtfBase && b.Neighbours(hackingFaction).nonEmpty =>
15.minutes
case _ =>
target.Definition.FacilityHackTime
}
target.HackedBy.map { target.HackedBy.map {
hackInfo => target.HackedBy = hackInfo.Duration(duration.toMillis) hackInfo => target.HackedBy = hackInfo.Duration(duration.toMillis)
} }