diff --git a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala index a20031138..0cf731891 100644 --- a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala +++ b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala @@ -118,11 +118,9 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex } } ops.fallHeightTracker(pos.z) - if (isCrouching && !player.Crouching) { - //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 - } +// if (isCrouching && !player.Crouching) { +// //dev stuff goes here +// } player.Position = pos player.Velocity = vel player.Orientation = Vector3(player.Orientation.x, pitch, yaw) diff --git a/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala b/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala index 3c4a92a53..f5c0197b7 100644 --- a/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala @@ -9,6 +9,9 @@ import net.psforever.objects.serverobject.deploy.Interference import net.psforever.objects.sourcing.ObjectSource import net.psforever.objects.vehicles.MountedWeapons 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.collection.mutable @@ -103,7 +106,13 @@ object ZoneDeployableActor { ): Boolean = { val position = obj.Position 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 zone.actor ! ZoneActor.AddToBlockMap(obj, position) true