PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

message for deployables being blocked; cleaning up dev test section

Browse source
This commit is contained in:
Fate-JH 2024-08-25 17:45:01 -04:00
parent 9f4452a36a
commit 9c7a607cf5
2 changed files with 13 additions and 6 deletions
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

@ -118,11 +118,9 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex
} }
} }
ops.fallHeightTracker(pos.z) ops.fallHeightTracker(pos.z)
if (isCrouching && !player.Crouching) { // if (isCrouching && !player.Crouching) {
//dev stuff goes here // //dev stuff goes here
//sendResponse(ChatMsg(ChatMessageType.UNK_227, "@fav_light_infantry")) //Light Infantry / Vehicle Driver // }
//sendResponse(ChatMsg(ChatMessageType.UNK_227, "@fav_heavy_infantry")) //Heavy Infantry
}
player.Position = pos player.Position = pos
player.Velocity = vel player.Velocity = vel
player.Orientation = Vector3(player.Orientation.x, pitch, yaw) player.Orientation = Vector3(player.Orientation.x, pitch, yaw)

11
src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala
View file

@ -9,6 +9,9 @@ import net.psforever.objects.serverobject.deploy.Interference
import net.psforever.objects.sourcing.ObjectSource import net.psforever.objects.sourcing.ObjectSource
import net.psforever.objects.vehicles.MountedWeapons import net.psforever.objects.vehicles.MountedWeapons
import net.psforever.objects.vital.SpawningActivity import net.psforever.objects.vital.SpawningActivity
import net.psforever.packet.game.ChatMsg
import net.psforever.services.local.{LocalAction, LocalServiceMessage}
import net.psforever.types.ChatMessageType
import scala.annotation.tailrec import scala.annotation.tailrec
import scala.collection.mutable import scala.collection.mutable
@ -103,7 +106,13 @@ object ZoneDeployableActor {
): Boolean = { ): Boolean = {
val position = obj.Position val position = obj.Position
deployableList.find(_ eq obj) match { deployableList.find(_ eq obj) match {
case None if Interference.Test(zone, obj).isEmpty => case _ if Interference.Test(zone, obj).nonEmpty =>
zone.LocalEvents ! LocalServiceMessage(
obj.OwnerName.getOrElse(""),
LocalAction.SendResponse(ChatMsg(ChatMessageType.UNK_227, "@nomove_intersecting"))
) //may not be the correct message but is sufficient at explaining why the deployable can not be built
false
case None =>
deployableList += obj deployableList += obj
zone.actor ! ZoneActor.AddToBlockMap(obj, position) zone.actor ! ZoneActor.AddToBlockMap(obj, position)
true true