Skip to content

Commit c03287d

Browse files
committed
some fixes
1 parent 4911edd commit c03287d

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

UncomplicatedCustomEscapeZones/Events/EventHandler.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
3434

3535
if (newRole is null)
3636
{
37-
ev.IsAllowed = false;
38-
LogManager.Debug($"Player {ev.Player.Nickname} has no role to be assigned after escaping!");
37+
ev.IsAllowed = true;
38+
LogManager.Warn($"Player {ev.Player.Nickname} evaluated for a natural respawn Reason: Player has no role to be assigned after escaping!");
39+
base.OnPlayerEscaping(ev);
3940
return;
4041
}
4142

43+
// bool: isCustomRole | object: RoleTypeId or CustomRoleId
4244
KeyValuePair<bool, object> newRoleValue = (KeyValuePair<bool, object>)newRole;
4345

4446
if (newRoleValue.Value is null)
4547
{
4648
ev.IsAllowed = true;
47-
LogManager.Debug($"Player {ev.Player.Nickname} evaluated for a natural respawn! {ev.EscapeScenario}");
49+
LogManager.Debug($"Player {ev.Player.Nickname} evaluated for a natural respawn! Reason: RoleAfterEscape returned null! {ev.EscapeScenario}");
4850
base.OnPlayerEscaping(ev);
4951
return;
5052
}

UncomplicatedCustomEscapeZones/Managers/EscapeManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public class EscapeManager
9494
{
9595
LogManager.Warn(
9696
$"Failed to parse an EscapeRole[key]: syntax should be cuffed by <source> <id>, found {elements.Count} args!\nSource: {kvp.Key}");
97-
return new KeyValuePair<bool, object?>(false, RoleTypeId.Spectator);
97+
return new KeyValuePair<bool, object?>(false, null);
9898
}
9999

100100
LogManager.Debug($"Parsing escape condition: {kvp.Key} -> {kvp.Value}");

0 commit comments

Comments
 (0)