Skip to content

Commit 728e863

Browse files
fix reply formatting for warns and errors
1 parent 7da34cf commit 728e863

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

ScriptSystem/Structures/PlayerConsoleExecutor.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,23 @@ public override void Reply(string content, Script scr)
1111

1212
public override void Warn(string content, Script scr)
1313
{
14-
Sender.gameConsoleTransmission.SendToClient(content, "yellow");
14+
Sender.gameConsoleTransmission.SendToClient(
15+
$"[WARN] " +
16+
$"[Script {scr.Name}] " +
17+
$"[{(scr.CurrentLine == 0 ? "Compile warning" : $"Line {scr.CurrentLine}")}] " +
18+
$"{content}",
19+
"yellow"
20+
);
1521
}
1622

1723
public override void Error(string content, Script scr)
1824
{
19-
Sender.gameConsoleTransmission.SendToClient(content, "red");
25+
Sender.gameConsoleTransmission.SendToClient(
26+
$"[ERROR] " +
27+
$"[Script {scr.Name}] " +
28+
$"[{(scr.CurrentLine == 0 ? "Compile error" : $"Line {scr.CurrentLine}")}] " +
29+
$"{content}",
30+
"red"
31+
);
2032
}
2133
}

ScriptSystem/Structures/ServerConsoleExecutor.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ public override void Warn(string content, Script scr)
2323

2424
public override void Error(string content, Script scr)
2525
{
26-
Log.RuntimeError(scr.Name, scr.CurrentLine, content);
26+
if (scr.CurrentLine == 0)
27+
{
28+
Log.CompileError(scr.Name, content);
29+
}
30+
else
31+
{
32+
Log.RuntimeError(scr.Name, scr.CurrentLine, content);
33+
}
2734
}
2835
}

0 commit comments

Comments
 (0)