From 85e5356a9c8adc6970bd89818c034ac0452fab5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BA=A1t=20Nh=C3=A2n=20Tr=C6=B0=C6=A1ng?=
 <truongdatnhan@gmail.com>
Date: Thu, 11 Aug 2022 01:33:48 +0700
Subject: [PATCH] Moving checking storage null to when loading char

---
 src/main/java/client/Character.java | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java
index 7eda2656fc..45ea15148e 100644
--- a/src/main/java/client/Character.java
+++ b/src/main/java/client/Character.java
@@ -7402,10 +7402,19 @@ public class Character extends AbstractCharacterObject {
                         }
                     }
                 }
-
+                
                 ret.buddylist.loadFromDb(charid);
                 ret.storage = wserv.getAccountStorage(ret.accountid);
-
+                /*
+                 * Bugs when player first time into server
+                 * The storage won't exist so nothing to load
+                 * and must wait until next login
+                 */
+                if(ret.storage == null) {
+                    wserv.loadAccountStorage(ret.accountid);
+                    ret.storage = wserv.getAccountStorage(ret.accountid);
+                }
+                
                 int startHp = ret.hp, startMp = ret.mp;
                 ret.reapplyLocalStats();
                 ret.changeHpMp(startHp, startMp, true);
@@ -8297,15 +8306,6 @@ public class Character extends AbstractCharacterObject {
                     }
                 }
 
-                /*
-                 * Bugs when player first time into server
-                 * The storage won't get initialize
-                 * and must wait until next login
-                 */
-                if (getStorage() == null) {
-                    Server.getInstance().getWorld(world).loadAccountStorage(accountid);
-                }
-
                 con.commit();
                 return true;
             } catch (Exception e) {