f

etorth · Jan 14, 2025 · c5d1b56 · c5d1b56
1 parent 2e6a823
commit c5d1b56
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/server/src/npcharop.cpp b/server/src/npcharop.cpp
@@ -29,7 +29,11 @@ void NPChar::on_AM_ACTION(const ActorMsgPack &mpk)
 void NPChar::on_AM_NPCEVENT(const ActorMsgPack &mpk)
 {
     fflassert(mpk.from());
-    const auto sdNPCE = mpk.deserialize<SDNPCEvent>();
+    auto sdNPCE = mpk.deserialize<SDNPCEvent>();
+
+    if(!sdNPCE.event.empty() && sdNPCE.event != SYS_ENTER){
+        sdNPCE.event = AESHelper(this, mpk.from()).decode(sdNPCE.event.c_str());
+    }
 
     // when CO initially sends a message to NPC, we assume its UID is the callStackUID
     // when NPC querys CO attributes the response should be handled in actor response handler, not here