From 5d97c4ebea2c34dd2797152707cead462036be37 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 15 Apr 2018 23:48:39 +0900
Subject: [PATCH] =?UTF-8?q?mailbox=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20'=EC=9E=AC=EC=95=BC'=EB=A5=BC=20=EB=82=B4=EB=B6=80?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=EB=A1=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_message.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/hwe/func_message.php b/hwe/func_message.php
index 474a652f..63d2497d 100644
--- a/hwe/func_message.php
+++ b/hwe/func_message.php
@@ -12,23 +12,19 @@ function getMailboxList(){
             $generalNations[$nationID] = [];
         }
 
-        $isChief = ($level == 12);
+        $obj = [$generalID, $generalName, 0];
 
-        $obj = [$generalID, $generalName];
-        if($isChief){
-            $obj[] = 1;
+        if($level == 12){
+            $obj[2] |= 1;
+        }
+
+        if($npc == 1){
+            $obj[2] |= 2;
         }
 
-        //TODO: 빙의장 정보 추가
         $generalNations[$nationID][] = $obj;
     }
 
-    $neutral = [
-        "nation"=>0,
-        "name"=>"재야",
-        "color"=>"#000000"
-    ];
-
     $result = array_map(function($nation) use ($generalNations) {
         $nationID = $nation['nation'];
 
@@ -43,7 +39,7 @@ function getMailboxList(){
             "color"=>$color,
             "general"=>$generals
         ];
-    }, array_merge([$neutral], getAllNationStaticInfo()));
+    }, array_merge([getNationStaticInfo(0)], getAllNationStaticInfo()));
 
     return $result;