PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing cosmetics issue that was blocking seeing the inventory for other players BR25+

Browse source
This commit is contained in:
FateJH 2017-12-06 23:33:17 -05:00
parent 3aee0ab4e8
commit 1931ae3a7b
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
View file

@ -19,7 +19,7 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
DressBattleRank(obj), DressBattleRank(obj),
DressCommandRank(obj), DressCommandRank(obj),
recursiveMakeImplantEffects(obj.Implants.iterator), recursiveMakeImplantEffects(obj.Implants.iterator),
None, //TODO cosmetics MakeCosmetics(obj.BEP),
InventoryData(MakeHolsters(obj, BuildEquipment).sortBy(_.parentSlot)), //TODO is sorting necessary? InventoryData(MakeHolsters(obj, BuildEquipment).sortBy(_.parentSlot)), //TODO is sorting necessary?
GetDrawnSlot(obj) GetDrawnSlot(obj)
) )
@ -138,12 +138,12 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
(0 until numImplants).map(index => { (0 until numImplants).map(index => {
val slot = implants(index) val slot = implants(index)
slot.Installed match { slot.Installed match {
case Some(_) => case Some(implant) =>
if(slot.Initialized) { if(slot.Initialized) {
ImplantEntry(slot.Implant, None) ImplantEntry(slot.Implant, None)
} }
else { else {
ImplantEntry(slot.Implant, Some(slot.Installed.get.Initialization.toInt)) ImplantEntry(slot.Implant, Some(implant.Initialization.toInt))
} }
case None => case None =>
ImplantEntry(ImplantType.None, None) ImplantEntry(ImplantType.None, None)
@ -173,10 +173,13 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
Some(ImplantEffects.PersonalShieldEffects) Some(ImplantEffects.PersonalShieldEffects)
case Some(`surge`) => case Some(`surge`) =>
Some(ImplantEffects.SurgeEffects) Some(ImplantEffects.SurgeEffects)
case _ => ; case _ =>
recursiveMakeImplantEffects(iter)
} }
} }
recursiveMakeImplantEffects(iter) else {
recursiveMakeImplantEffects(iter)
}
} }
} }