PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't drop

Browse source
This commit is contained in:
ScrawnyRonnie 2025-05-22 12:08:56 -04:00
parent 0621cb4fcd
commit 5d00a10e80
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -448,11 +448,11 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm
//loadout for a MAX //loadout for a MAX
player.ResistArmMotion(PlayerControl.maxRestriction) player.ResistArmMotion(PlayerControl.maxRestriction)
player.DrawnSlot = Player.HandsDownSlot player.DrawnSlot = Player.HandsDownSlot
(newHolsters.filter(_.start == 4), newInventory) (newHolsters.filter(_.start == 4), newInventory.filterNot(dropPred))
} else { } else {
//loadout for a vanilla exo-suit //loadout for a vanilla exo-suit
player.ResistArmMotion(Player.neverRestrict) player.ResistArmMotion(Player.neverRestrict)
(newHolsters, newInventory) (newHolsters.filterNot(dropPred), newInventory.filterNot(dropPred))
} }
} else { } else {
//proposed loadout conforms to a different inventory layout than the projected exo-suit //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) //holsters (matching holsters will be inserted, the rest will deposited into the inventory)
val (finalHolsters, leftoversForInventory) = Players.fillEmptyHolsters( val (finalHolsters, leftoversForInventory) = Players.fillEmptyHolsters(
player.Holsters().iterator, 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) //inventory (items will be placed to accommodate the change, or dropped)
val (finalInventory, _) = GridInventory.recoverInventory(leftoversForInventory, player.Inventory) val (finalInventory, _) = GridInventory.recoverInventory(leftoversForInventory, player.Inventory)

4
src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala
View file

@ -678,8 +678,8 @@ object ContainableBehavior {
val faction = GlobalDefinitions.isFactionEquipment(objDef) val faction = GlobalDefinitions.isFactionEquipment(objDef)
GlobalDefinitions.isCavernEquipment(objDef) || GlobalDefinitions.isCavernEquipment(objDef) ||
objDef == GlobalDefinitions.router_telepad || objDef == GlobalDefinitions.router_telepad ||
entry.obj.isInstanceOf[BoomerTrigger] || entry.obj.isInstanceOf[BoomerTrigger] /*||
(faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL) (faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL)*/
} }
} }