Skip to content

Commit 91f7943

Browse files
fix variable and run errors
1 parent 1bce747 commit 91f7943

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

Code/ScriptSystem/Script.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ public void Run(RunContext context = RunContext.Unknown, Script? caller = null)
180180
return null;
181181
}
182182

183+
StartTime = DateTime.Now;
184+
Context = context;
185+
Caller = caller;
186+
183187
if (ScriptFlagHandler.DoFlagsApproveExecution(this).HasErrored(out var error))
184188
{
185189
Executor.Error(error, this);
@@ -188,9 +192,6 @@ public void Run(RunContext context = RunContext.Unknown, Script? caller = null)
188192

189193
RunningScriptsList.Add(this);
190194
//Profile = new Profile(this);
191-
StartTime = DateTime.Now;
192-
Context = context;
193-
Caller = caller;
194195
_scriptCoroutine = InternalExecute().Run(
195196
this,
196197
_ => _scriptCoroutine.Kill()

Code/VariableSystem/VariableIndex.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public static void Initialize()
7777

7878
public static void AddGlobalVariable(Variable variable)
7979
{
80-
Script.CheckForVariableNameCollisions(variable, GlobalVariables);
8180
foreach (var runningScript in Script.RunningScripts)
8281
{
8382
Script.CheckForVariableNameCollisions(variable, runningScript.LocalVariables);
@@ -89,8 +88,8 @@ public static void AddGlobalVariable(Variable variable)
8988

9089
public static void RemoveGlobalVariable(Variable variable)
9190
{
92-
GlobalVariables.RemoveAll(existingVar =>
93-
existingVar.Name == variable.Name &&
94-
existingVar.GetType() == variable.GetType());
91+
GlobalVariables.RemoveAll(
92+
existingVar => Variable.AreSyntacticallySame(existingVar, variable)
93+
);
9594
}
9695
}

0 commit comments

Comments
 (0)