diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index 2c97a377..7d17cdad 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -2039,8 +2039,8 @@ class WorldSessionActor extends Actor with MDCContextAware { case Some(obj : Equipment) => val findFunc : PlanetSideGameObject with Container => Option[(PlanetSideGameObject with Container, Option[Int])] = FindInLocalContainer(object_guid) - findFunc(player) - .orElse(findFunc(player.Locker)) + findFunc(player.Locker) + .orElse(findFunc(player)) .orElse(accessedContainer match { case Some(parent) => findFunc(parent)