Skip to content

Commit aeeaea9

Browse files
committed
fix: various small problem
1 parent 87923d1 commit aeeaea9

6 files changed

Lines changed: 15 additions & 12 deletions

File tree

EnvManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public unsafe void InitializeSkyboxForPlayer(CCSPlayerController player)
3535

3636
public unsafe void OnPlayerLeave(int slot)
3737
{
38+
if (!SpawnedSkyboxes.ContainsKey(slot)) return;
3839
var index = SpawnedSkyboxes[slot];
3940
CEnvSky sky = Utilities.GetEntityFromIndex<CEnvSky>(index)!;
4041
nint ptr = Helper.FindMaterialByPath("materials/notexist.vmat");

Memory.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
using CounterStrikeSharp.API.Core;
55
using CounterStrikeSharp.API.Modules.Memory;
66
using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
7-
using SkyboxChanger;
7+
8+
namespace SkyboxChanger;
89

910
class MemoryManager
1011
{
@@ -92,7 +93,8 @@ private static unsafe IntPtr FindSpawnGroupMgrGameSystem()
9293
pFactoryList = pNext;
9394
}
9495

95-
throw new Exception("FAILED TO FIND SpawnGroupManagerGameSystem. The game ma y have been updated, please report it to the author.");
96+
97+
throw new Exception("FAILED TO FIND SpawnGroupManagerGameSystem. The game may have been updated, please report it to the author.");
9698
}
9799

98100

Plugin.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace SkyboxChanger;
1717
public class SkyboxChanger : BasePlugin, IPluginConfig<SkyboxConfig>
1818
{
1919
public override string ModuleName => "Skybox Changer";
20-
public override string ModuleVersion => "1.3.0";
20+
public override string ModuleVersion => "1.3.1";
2121
public override string ModuleAuthor => "samyyc";
2222

2323
public SkyboxConfig Config { get; set; } = new();
@@ -124,7 +124,7 @@ public override unsafe void Load(bool hotReload)
124124
RegisterListener<Listeners.OnClientDisconnect>(slot =>
125125
{
126126
EnvManager.OnPlayerLeave(slot);
127-
Service.Save(Utilities.GetPlayerFromSlot(slot)?.AuthorizedSteamID?.SteamId64);
127+
Service.Save(Utilities.GetPlayerFromSlot(slot)?.SteamID);
128128
});
129129
InitializeMenuSystem(hotReload);
130130
Helper.Initialize();

Service.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ public Service(SkyboxChanger plugin, string host, int port, string user, string
1717

1818
public bool SetSkybox(CCSPlayerController player, string index)
1919
{
20-
_Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Skybox = index;
20+
_Storage.GetPlayerSkydata(player.SteamID).Skybox = index;
2121
Skybox skybox = _Plugin.Config.Skyboxs[index];
2222
if (skybox.Brightness != null)
2323
{
2424
_Plugin.EnvManager.SetBrightness(player.Slot, skybox.Brightness.Value);
25-
_Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Brightness = skybox.Brightness.Value;
25+
_Storage.GetPlayerSkydata(player.SteamID).Brightness = skybox.Brightness.Value;
2626
}
2727
if (skybox.Color != null)
2828
{
@@ -34,38 +34,38 @@ public bool SetSkybox(CCSPlayerController player, string index)
3434
var b = int.Parse(colorData[2]);
3535
var a = int.Parse(colorData[3]);
3636
_Plugin.EnvManager.SetTintColor(player.Slot, Color.FromArgb(a, r, g, b));
37-
_Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Color = Color.FromArgb(a, r, g, b).ToArgb();
37+
_Storage.GetPlayerSkydata(player.SteamID).Color = Color.FromArgb(a, r, g, b).ToArgb();
3838
}
3939
}
4040
return _Plugin.EnvManager.SetSkybox(player.Slot, skybox);
4141
}
4242

4343
public void SetBrightness(CCSPlayerController player, float brightness)
4444
{
45-
_Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Brightness = brightness;
45+
_Storage.GetPlayerSkydata(player.SteamID).Brightness = brightness;
4646
_Plugin.EnvManager.SetBrightness(player.Slot, brightness);
4747
}
4848

4949
public void SetTintColor(CCSPlayerController player, Color color)
5050
{
51-
_Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Color = color.ToArgb();
51+
_Storage.GetPlayerSkydata(player.SteamID).Color = color.ToArgb();
5252
_Plugin.EnvManager.SetTintColor(player.Slot, color);
5353
}
5454

5555
public Skybox? GetPlayerSkybox(CCSPlayerController player)
5656
{
57-
var skyboxData = _Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64);
57+
var skyboxData = _Storage.GetPlayerSkydata(player.SteamID);
5858
return _Plugin.Config.Skyboxs.GetValueOrDefault(skyboxData.Skybox);
5959
}
6060

6161
public float GetPlayerBrightness(CCSPlayerController player)
6262
{
63-
return _Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Brightness;
63+
return _Storage.GetPlayerSkydata(player.SteamID).Brightness;
6464
}
6565

6666
public Color GetPlayerColor(CCSPlayerController player)
6767
{
68-
return Color.FromArgb(_Storage.GetPlayerSkydata(player.AuthorizedSteamID!.SteamId64).Color);
68+
return Color.FromArgb(_Storage.GetPlayerSkydata(player.SteamID).Color);
6969
}
7070

7171
public Skybox? GetMapDefaultSkybox(string map)
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)