From 5d00a10e80fe168f4fa84aaee669aa475acb8d1c Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Thu, 22 May 2025 12:08:56 -0400 Subject: [PATCH] don't drop --- .../scala/net/psforever/objects/avatar/PlayerControl.scala | 6 +++--- .../serverobject/containable/ContainableBehavior.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala index 16df2a05d..ee5fef561 100644 --- a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala +++ b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala @@ -448,11 +448,11 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm //loadout for a MAX player.ResistArmMotion(PlayerControl.maxRestriction) player.DrawnSlot = Player.HandsDownSlot - (newHolsters.filter(_.start == 4), newInventory) + (newHolsters.filter(_.start == 4), newInventory.filterNot(dropPred)) } else { //loadout for a vanilla exo-suit player.ResistArmMotion(Player.neverRestrict) - (newHolsters, newInventory) + (newHolsters.filterNot(dropPred), newInventory.filterNot(dropPred)) } } else { //proposed loadout conforms to a different inventory layout than the projected exo-suit @@ -460,7 +460,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm //holsters (matching holsters will be inserted, the rest will deposited into the inventory) val (finalHolsters, leftoversForInventory) = Players.fillEmptyHolsters( player.Holsters().iterator, - (newHolsters.filterNot(_.obj.Size == EquipmentSize.Max) ++ newInventory) + (newHolsters.filterNot(_.obj.Size == EquipmentSize.Max) ++ newInventory).filterNot(dropPred) ) //inventory (items will be placed to accommodate the change, or dropped) val (finalInventory, _) = GridInventory.recoverInventory(leftoversForInventory, player.Inventory) diff --git a/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala index d3680de99..04ffa27a0 100644 --- a/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala +++ b/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala @@ -678,8 +678,8 @@ object ContainableBehavior { val faction = GlobalDefinitions.isFactionEquipment(objDef) GlobalDefinitions.isCavernEquipment(objDef) || objDef == GlobalDefinitions.router_telepad || - entry.obj.isInstanceOf[BoomerTrigger] || - (faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL) + entry.obj.isInstanceOf[BoomerTrigger] /*|| + (faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL)*/ } }