5 files changed, 9 insertions, 9 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index d463f3b7..4bc624a8 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -15,8 +15,8 @@ L_StartTimer:
 
 OnTimer20000:
     setnpctimer 0;
-    cmdothernpc "#XmasConfig", "RestartQuest";
-    cmdothernpc "#HalloweenConfig", "RestartQuest";
+    donpcevent "#XmasConfig::OnCommandRestartQuest";
+    donpcevent "#HalloweenConfig::OnCommandRestartQuest";
     initnpctimer;
     end;
 }
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index 38bed87f..07717b35 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -75,7 +75,7 @@ L_HalloweenError:
 
 L_SetNewKey:
     setarray $HALLOWEEN_TIME_KEY, @halloween_time_key_smonth, @halloween_time_key_srmonth, @halloween_time_key_emonth, @halloween_time_key_rsday, @halloween_time_key_reday, @halloween_time_key_year;
-    cmdothernpc "#HalloweenConfig", "RestartQuest";
+    donpcevent "#HalloweenConfig::OnCommandRestartQuest";
     goto L_Debug;
 
 L_QuestState:
diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt
index dc49e865..394a1a1b 100644
--- a/world/map/npc/annuals/tree_beard.txt
+++ b/world/map/npc/annuals/tree_beard.txt
@@ -70,7 +70,7 @@
 
 function|script|SpawnMobs
 {
-    cmdothernpc "XmasSpawnManager", "SpawnStart";
+    donpcevent "XmasSpawnManager::OnCommandSpawnStart";
     return;
 }
 
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index fe0582e7..0e3c38a2 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -128,11 +128,11 @@ L_XmasError:
 
 L_SetNewKey:
     setarray $XMAS_TIME_KEY, @xmas_time_key_smonth, @xmas_time_key_srmonth, @xmas_time_key_emonth, @xmas_time_key_rsday, @xmas_time_key_reday, @xmas_time_key_year;
-    cmdothernpc "#XmasConfig", "RestartQuest";
+    donpcevent "#XmasConfig::OnCommandRestartQuest";
     goto L_Close;
 
 L_XmasChamberReset:
-    cmdothernpc "AniManOMat", "ChamberReset";
+    donpcevent "AniManOMat::OnCommandChamberReset";
     goto L_Close;
 
 L_XmasState:
diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt
index 897054c9..d4be46dc 100644
--- a/world/map/npc/annuals/xmas/mobmanager.txt
+++ b/world/map/npc/annuals/xmas/mobmanager.txt
@@ -59,7 +59,7 @@ L_End:
     end;
 
 OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
+    donpcevent "XmasSpawnManager::OnCommandTally";
     end;
 }
 
@@ -68,7 +68,7 @@ OnTally:
     end;
 
 OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
+    donpcevent "XmasSpawnManager::OnCommandTally";
     end;
 }
 
@@ -77,6 +77,6 @@ OnTally:
     end;
 
 OnTally:
-    cmdothernpc "XmasSpawnManager", "Tally";
+    donpcevent "XmasSpawnManager::OnCommandTally";
     end;
 }