From 7ed2cc7af44d27b7906bcad841368412772e4a3a Mon Sep 17 00:00:00 2001 From: Mazo Date: Tue, 2 Feb 2021 21:08:01 +0000 Subject: [PATCH] Dont unload vehicle inventory when closing trunk after rearming --- .../scala/net/psforever/actors/session/SessionActor.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala index 98b3a5fd..e64c5342 100644 --- a/src/main/scala/net/psforever/actors/session/SessionActor.scala +++ b/src/main/scala/net/psforever/actors/session/SessionActor.scala @@ -4910,7 +4910,11 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con TryDisposeOfLootedCorpse(obj) case Some(obj: Container) => - UnaccessContainer(obj) + // Make sure we don't unload the contents of the vehicle the player is seated in + // An example scenario of this would be closing the trunk contents when rearming at a landing pad + if (player.VehicleSeated.isEmpty || player.VehicleSeated.get != obj.GUID) { + UnaccessContainer(obj) + } case _ => ; }