replenishing supply of thrown grenades from player inventory; pulled in locker search for Player.Find to avoid wrongful indexing

This commit is contained in:
FateJH 2018-05-08 23:55:01 -04:00
parent ddf2f53d8a
commit ba49b5859e
2 changed files with 55 additions and 5 deletions

View file

@ -200,10 +200,7 @@ class Player(private val core : Avatar) extends PlanetSideGameObject with Factio
case Some(index) =>
Some(index)
case None =>
if(Locker.Find(guid).isDefined) {
Some(5)
}
else if(freeHand.Equipment.isDefined && freeHand.Equipment.get.GUID == guid) {
if(freeHand.Equipment.isDefined && freeHand.Equipment.get.GUID == guid) {
Some(Player.FreeHandSlot)
}
else {