Skip to content

Commit 8c0257f

Browse files
Fixed issue where new players couldn't enter vehicles
1 parent 2b9542f commit 8c0257f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ShimmysAdminTools/main.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class main : RocketPlugin<PluginConfig>
1313
{
1414
public static main Instance;
1515
public static PluginConfig Config;
16+
1617
public override void LoadPlugin()
1718
{
1819
base.LoadPlugin();
@@ -26,6 +27,7 @@ public override void LoadPlugin()
2627
Rocket.Unturned.Events.UnturnedPlayerEvents.OnPlayerUpdateGesture += UnturnedPlayerEvents_OnPlayerUpdateGesture;
2728
LoadCurrentPlayers();
2829
}
30+
2931
public override TranslationList DefaultTranslations => new TranslationList()
3032
{
3133
{ "Flight_Enabled", "Flight Enabled." },
@@ -76,12 +78,15 @@ private void UnturnedPlayerEvents_OnPlayerUpdateGesture(UnturnedPlayer player, R
7678
private void Events_OnBeforePlayerConnected(UnturnedPlayer player)
7779
{
7880
PlayerSessionStore.TryRegisterPlayer(player);
81+
PlayerDataStore.TryRegisterPlayer(player);
7982
}
80-
8183
private void VehicleManager_onEnterVehicleRequested(Player player, InteractableVehicle vehicle, ref bool shouldAllow)
8284
{
8385
var Data = PlayerDataStore.GetPlayerData(UnturnedPlayer.FromPlayer(player));
84-
if (!Data.CanEnterVehicle) shouldAllow = false;
86+
if (Data != null)
87+
{
88+
if (!Data.CanEnterVehicle) shouldAllow = false;
89+
}
8590
}
8691

8792
private void Events_OnPlayerDisconnected(UnturnedPlayer player)
@@ -105,7 +110,7 @@ public override void UnloadPlugin(PluginState state = PluginState.Unloaded)
105110
U.Events.OnPlayerDisconnected -= Events_OnPlayerDisconnected;
106111
VehicleManager.onEnterVehicleRequested -= VehicleManager_onEnterVehicleRequested;
107112
Rocket.Unturned.Events.UnturnedPlayerEvents.OnPlayerUpdateGesture -= UnturnedPlayerEvents_OnPlayerUpdateGesture;
108-
foreach(var Session in PlayerSessionStore.Store)
113+
foreach (var Session in PlayerSessionStore.Store)
109114
{
110115
if (Session.Value.FlySessionActive) Session.Value.FlySession.Stop();
111116
if (Session.Value.NoClipSessionActive) Session.Value.NoClip.Stop();

0 commit comments

Comments
 (0)