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

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

Browse source
This commit is contained in:
Fate-JH 2024-08-06 23:37:14 -04:00 • committed by GitHub
parent 02f95a293e
commit 46ad7148a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
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 val zoneNum = saveOpt
.collect { .collect {
case persistence.Savedplayer(_, _, _, _, _, zoneNum, _, _, exosuitNum, loadout) => case persistence.Savedplayer(_, _, _, _, _, zoneNum, _, _, exosuitNum, loadout) =>
player.ExoSuit = ExoSuitType(exosuitNum) val exo = ExoSuitType(exosuitNum)
player.ExoSuit = exo
AvatarActor.buildHolsterEquipmentFromClob(player, loadout, log) AvatarActor.buildHolsterEquipmentFromClob(player, loadout, log)
if (exo == ExoSuitType.MAX) {
player.DrawnSlot = 0 //max arm up
}
zoneNum zoneNum
} }
.getOrElse { .getOrElse {
@ -2154,6 +2158,12 @@ class AvatarActor(
.Holsters() .Holsters()
.foreach(holster => .foreach(holster =>
holster.Equipment match { 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) => case Some(tool: Tool) =>
tool.AmmoSlots.foreach(slot => { tool.AmmoSlots.foreach(slot => {
slot.Box.GUID = PlanetSideGUID(gen.getAndIncrement) slot.Box.GUID = PlanetSideGUID(gen.getAndIncrement)