f

etorth · Jan 14, 2025 · 9cc6269 · 9cc6269
1 parent c5d1b56
commit 9cc6269
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/server/src/npchar.cpp b/server/src/npchar.cpp
@@ -43,6 +43,10 @@ std::string NPChar::AESHelper::decode(const char *s)
 {
     auto buf = base64f::decode(to_sv(s));
     decrypt(buf);
+
+    while(!(buf.empty() || buf.back() != '\0')){
+        buf.pop_back();
+    }
     return buf;
 }
 

diff --git a/server/src/npcharop.cpp b/server/src/npcharop.cpp
@@ -33,6 +33,7 @@ void NPChar::on_AM_NPCEVENT(const ActorMsgPack &mpk)
 
     if(!sdNPCE.event.empty() && sdNPCE.event != SYS_ENTER){
         sdNPCE.event = AESHelper(this, mpk.from()).decode(sdNPCE.event.c_str());
+        m_xmlLayoutSeqIDList.erase(mpk.from());
     }
 
     // when CO initially sends a message to NPC, we assume its UID is the callStackUID