PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drop medapp so client does not crash after character select; also, max needs arm raised

Browse source
This commit is contained in:
Fate-JH 2024-08-05 16:40:26 -04:00
parent 02f95a293e
commit 7cd319107f
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/scala/net/psforever/actors/session/AvatarActor.scala
View file

@ -2134,8 +2134,12 @@ class AvatarActor(
val zoneNum = saveOpt
.collect {
case persistence.Savedplayer(_, _, _, _, _, zoneNum, _, _, exosuitNum, loadout) =>
player.ExoSuit = ExoSuitType(exosuitNum)
val exo = ExoSuitType(exosuitNum)
player.ExoSuit = exo
AvatarActor.buildHolsterEquipmentFromClob(player, loadout, log)
if (exo == ExoSuitType.MAX) {
player.DrawnSlot = 0 //max arm up
}
zoneNum
}
.getOrElse {
@ -2154,6 +2158,12 @@ class AvatarActor(
.Holsters()
.foreach(holster =>
holster.Equipment match {
case Some(tool: Tool) if tool.Definition == GlobalDefinitions.medicalapplicator =>
//todo fix so player may hold medapp when loading the zone (client crash)
val item = SimpleItem(GlobalDefinitions.flail_targeting_laser)
holster.Equipment = None
holster.Equipment = item
item.GUID = PlanetSideGUID(gen.getAndIncrement)
case Some(tool: Tool) =>
tool.AmmoSlots.foreach(slot => {
slot.Box.GUID = PlanetSideGUID(gen.getAndIncrement)