Merge branch 'jesusalva/cleanup' into 'master'

Christmas 2021 Cleanup

See merge request themanaworld/evolved/serverdata!10

1 files changed, 10 insertions, 2 deletions

diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index e5e6e5d4..65d21291 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -1,7 +1,6 @@
+// Update variables on server init, login and logout
 
 function	script	ClearVariables	{
-    if (@login_event != 1) goto L_Deprecated;
-
     // Some temporary bugfix
     GM = getgroupid();
 
@@ -142,6 +141,15 @@ function	script	ClearVariables	{
 }
 
 
+function	script	FlushVariables	{
+    // Some variables should not be saved
+    GM = 0;
+    ##01_TMWEXP = 0;
+    return;
+}
+
+
+
 function	script	ServerUpdate	{
     if ($@STARTUP) {
         debugmes "Cowardly refusing to update server outside startup";