From 9a17eb37415e12c4bf5e11efdf5cc44ea1078398 Mon Sep 17 00:00:00 2001
From: FateJH <Jason_DiDonato@yahoo.com>
Date: Tue, 8 May 2018 09:54:30 -0400
Subject: [PATCH] fix for locker contents being cleared

---
 pslogin/src/main/scala/WorldSessionActor.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)