Skip to content

Commit 8ad8ec8

Browse files
clean up after last fix
1 parent 0cfdc71 commit 8ad8ec8

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

ShimmysAdminTools/Modules/PlayerSessionStore.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace ShimmysAdminTools.Modules
1111
{
12+
// TODO: Migrate from player session store to mono behaviors
1213
public static class PlayerSessionStore
1314
{
1415
public static Dictionary<ulong, PlayerSession> Store;

ShimmysAdminTools/main.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public partial class main : RocketPlugin<PluginConfig>
2525
{
2626
public static main Instance;
2727
public static PluginConfig Config;
28-
public CheckPermissions BaseCheckPermissions;
2928

3029
public float ServerSpeedMult = 1;
3130
public float ServerJumpMult = 1;
@@ -89,7 +88,7 @@ private void Events_OnPlayerConnected(UnturnedPlayer player)
8988

9089
private void OnLevelloaded(int level)
9190
{
92-
if (State == PluginState.Loaded && Config.DelayStartEXECUtility)
91+
if (State == PluginState.Loaded && Config.DelayStartEXECUtility && level >= 2)
9392
{
9493
ExecManager.Activate();
9594
}
@@ -145,7 +144,6 @@ private void Chat_OnCheckPermissions(SteamPlayer player, string text, ref bool s
145144
{
146145
playerData.IsMuted = false;
147146
playerData.MuteIsTemp = false;
148-
BaseCheckPermissions(player, text, ref shouldExecuteCommand, ref shouldList);
149147
return;
150148
}
151149
else
@@ -165,14 +163,6 @@ private void Chat_OnCheckPermissions(SteamPlayer player, string text, ref bool s
165163
}
166164
}
167165
}
168-
else
169-
{
170-
BaseCheckPermissions(player, text, ref shouldExecuteCommand, ref shouldList);
171-
}
172-
}
173-
else
174-
{
175-
BaseCheckPermissions(player, text, ref shouldExecuteCommand, ref shouldList);
176166
}
177167
}
178168

@@ -349,7 +339,6 @@ public override void UnloadPlugin(PluginState state = PluginState.Unloaded)
349339
if (Session.Value.FlySessionActive) Session.Value.FlySession.Stop();
350340
if (Session.Value.NoClipSessionActive) Session.Value.NoClip.Stop();
351341
}
352-
ChatManager.onCheckPermissions = BaseCheckPermissions;
353342
base.UnloadPlugin(state);
354343
}
355344
}

0 commit comments

Comments
 (0)