diff --git a/src/game/GameProcMain.cpp b/src/game/GameProcMain.cpp
index 2e6bb4b0..7a6d11e5 100644
--- a/src/game/GameProcMain.cpp
+++ b/src/game/GameProcMain.cpp
@@ -4173,7 +4173,7 @@ bool CGameProcMain::MsgSend_NPCEvent(short siIDTarget) {
     int  iOffset = 0;
 
     CAPISocket::MP_AddByte(byBuff, iOffset, N3_WARP_LIST);
-    CAPISocket::MP_AddByte(byBuff, iOffset, WI.iID); // 워프 아이디 보내기...
+    CAPISocket::MP_AddShort(byBuff, iOffset, WI.iID); // 워프 아이디 보내기...
     s_pSocket->Send(byBuff, iOffset);
 }
 
diff --git a/src/server/Ebenezer/GameDefine.h b/src/server/Ebenezer/GameDefine.h
index e3880499..43bf37a8 100644
--- a/src/server/Ebenezer/GameDefine.h
+++ b/src/server/Ebenezer/GameDefine.h
@@ -543,6 +543,7 @@ struct _WARP_INFO {
     float fY;
     float fZ;
     float fR;
+    short sNation;
 
     _WARP_INFO() {
         sWarpID = 0;
diff --git a/src/server/Ebenezer/User.cpp b/src/server/Ebenezer/User.cpp
index 472ac14b..8a26952a 100644
--- a/src/server/Ebenezer/User.cpp
+++ b/src/server/Ebenezer/User.cpp
@@ -2315,7 +2315,7 @@ void CUser::ZoneChange(int zone, float x, float z) {
         }
     } else { // Battle zone close
         if (pMap->m_bType == 1 && m_pUserData->m_bNation != zone &&
-            (zone < 10 || zone > 20)) { // 상대방 국가로 못넘어 가게..
+            (zone < 10 || zone > 21)) { // 상대방 국가로 못넘어 가게..
             return;
         }
     }