PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-26 07:19:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing Infiltration Suit issues as well as streamlining the process of exo-suit switching

Browse source
This commit is contained in:
FateJH 2018-05-19 15:13:36 -04:00
parent cf3bf19d4d
commit a3f50cc8a4
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -727,7 +727,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
val (dropHolsters, beforeHolsters) = clearHolsters(tplayer.Holsters().iterator).partition(dropPred)
val (dropInventory, beforeInventory) = tplayer.Inventory.Clear().partition(dropPred)
//change suit (clear inventory and change holster sizes; note: holsters must be empty before this point)
Player.SuitSetup(tplayer, exosuit)
tplayer.ExoSuit = exosuit
tplayer.Armor = tplayer.MaxArmor
//delete everything not dropped
(beforeHolsters ++ beforeInventory).foreach({ elem =>
@ -859,7 +859,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
val (_, afterInventory) = inventory.partition(dropPred) //dropped items are lost
val beforeFreeHand = tplayer.FreeHand.Equipment
//change suit (clear inventory and change holster sizes; note: holsters must be empty before this point)
Player.SuitSetup(tplayer, exosuit)
tplayer.ExoSuit = exosuit
tplayer.Armor = tplayer.MaxArmor
//delete everything (not dropped)
beforeHolsters.foreach({ elem =>