From 24ec89c342b4fc01b6aa084421185d6da5578706 Mon Sep 17 00:00:00 2001
From: Snivy Films <Snivy.Films@gmail.com>
Date: Wed, 30 Apr 2025 10:41:31 -0400
Subject: [PATCH 1/2] Exiled 9.6 Update

---
 Common Utilities/Common Utilities.csproj      | 31 ++++++++++++++-----
 .../EventHandlers/PlayerHandlers.cs           | 10 ++++--
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Common Utilities/Common Utilities.csproj b/Common Utilities/Common Utilities.csproj
index a0bf5d3..d41c401 100644
--- a/Common Utilities/Common Utilities.csproj	
+++ b/Common Utilities/Common Utilities.csproj	
@@ -23,16 +23,33 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ExMod.Exiled" Version="9.1.1" />
+        <PackageReference Include="ExMod.Exiled" Version="9.6.0-beta8" />
         <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)" IncludeAssets="All" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="Assembly-CSharp-firstpass" HintPath="$(EXILED_REFERENCES)\Assembly-CSharp-firstpass.dll" Private="false" />
-        <Reference Include="Mirror" HintPath="$(EXILED_REFERENCES)\Mirror.dll" Private="false" />
-        <Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
-        <Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
-        <Reference Include="UnityEngine.PhysicsModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.PhysicsModule.dll" Private="false" />
-        <Reference Include="YamlDotNet" HintPath="$(EXILED_REFERENCES)\YamlDotNet.dll" Private="false" />
+        <Reference Include="Assembly-CSharp-firstpass">
+            <HintPath Condition="'$(OS)' == 'Windows_NT'">$(EXILED_REFERENCES)\Assembly-CSharp-firstpass.dll</HintPath>
+            <HintPath Condition="'$(OS)' != 'Windows_NT'">..\..\..\Exiled_Resources\Assembly-CSharp-firstpass.dll</HintPath>
+        </Reference>
+        <Reference Include="Mirror">
+            <HintPath Condition="'$(OS)' == 'Windows_NT'">$(EXILED_REFERENCES)\Mirror.dll</HintPath>
+            <HintPath Condition="'$(OS)' != 'Windows_NT'">..\..\..\Exiled_Resources\Mirror.dll</HintPath>
+        </Reference>
+        <Reference Include="UnityEngine">
+            <HintPath Condition="'$(OS)' == 'Windows_NT'">$(EXILED_REFERENCES)\UnityEngine.dll</HintPath>
+            <HintPath Condition="'$(OS)' != 'Windows_NT'">..\..\..\Exiled_Resources\UnityEngine.dll</HintPath>
+        </Reference>
+        <Reference Include="UnityEngine.CoreModule">
+            <HintPath Condition="'$(OS)' == 'Windows_NT'">$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll</HintPath>
+            <HintPath Condition="'$(OS)' != 'Windows_NT'">..\..\..\Exiled_Resources\UnityEngine.CoreModule.dll</HintPath>
+        </Reference>
+        <Reference Include="UnityEngine.PhysicsModule">
+            <HintPath Condition="'$(OS)' == 'Windows_NT'">$(EXILED_REFERENCES)/UnityEngine.PhysicsModule.dll</HintPath>
+            <HintPath Condition="'$(OS)' != 'Windows_NT'">..\..\..\Exiled_Resources\UnityEngine.PhysicsModule.dll</HintPath>
+        </Reference>
+        <Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+            <HintPath>..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\YamlDotNet.dll</HintPath>
+        </Reference>
     </ItemGroup>
 </Project>
diff --git a/Common Utilities/EventHandlers/PlayerHandlers.cs b/Common Utilities/EventHandlers/PlayerHandlers.cs
index 77267fb..9b785bb 100644
--- a/Common Utilities/EventHandlers/PlayerHandlers.cs	
+++ b/Common Utilities/EventHandlers/PlayerHandlers.cs	
@@ -1,4 +1,6 @@
 using System.Collections.Specialized;
+using Exiled.Permissions;
+using Exiled.Permissions.Features;
 
 namespace Common_Utilities.EventHandlers;
 
@@ -12,6 +14,8 @@ namespace Common_Utilities.EventHandlers;
 using Exiled.CustomItems.API.Features;
 using Exiled.Events.EventArgs.Interfaces;
 using Exiled.Events.EventArgs.Player;
+using LabApi.Features.Permissions;
+using LabApi.Features.Permissions.Providers;
 using PlayerRoles;
 using UnityEngine;
 
@@ -56,12 +60,12 @@ public void OnChangingRole(ChangingRoleEventArgs ev)
             if (config.StartingInventories[ev.NewRole].Ammo == null || config.StartingInventories[ev.NewRole].Ammo.Count <= 0) 
                 return;
             
-            if (config.StartingInventories[ev.NewRole].Ammo.Any(s => string.IsNullOrEmpty(s.Group) || s.Group == "none" || (ServerStatic.PermissionsHandler._groups.TryGetValue(s.Group, out UserGroup userGroup) && userGroup == ev.Player.Group)))
+            if (config.StartingInventories[ev.NewRole].Ammo.Any(s => string.IsNullOrEmpty(s.Group) || s.Group == "none" || s.Group == ev.Player.Group.Name))
             {
                 ev.Ammo.Clear();
                 foreach ((ItemType type, ushort amount, string group) in config.StartingInventories[ev.NewRole].Ammo)
                 {
-                    if (string.IsNullOrEmpty(group) || group == "none" || (ServerStatic.PermissionsHandler._groups.TryGetValue(group, out UserGroup userGroup) && userGroup == ev.Player.Group))
+                    if (string.IsNullOrEmpty(group) || group == "none" || group == ev.Player.Group.Name)
                     {
                         ev.Ammo.Add(type, amount);
                     }
@@ -166,7 +170,7 @@ public List<ItemType> GetStartingInventory(RoleTypeId role, Player player = null
                     player == null 
                     || string.IsNullOrEmpty(x.Group) 
                     || x.Group == "none" 
-                    || (ServerStatic.PermissionsHandler._groups.TryGetValue(x.Group, out var group) && group == player.Group))
+                    || x.Group == player.Group.Name)
                 .ToList();
 
             Log.Debug($"{nameof(GetStartingInventory)} Finished checking groups, found {itemChances.Count} valid itemChances.");

From 869f217a403ea3d963e900668a826d416cf7ba25 Mon Sep 17 00:00:00 2001
From: Miki_hero <100715076+Mikihero@users.noreply.github.com>
Date: Thu, 22 May 2025 14:42:40 +0200
Subject: [PATCH 2/2] removed usings

---
 Common Utilities/EventHandlers/PlayerHandlers.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Common Utilities/EventHandlers/PlayerHandlers.cs b/Common Utilities/EventHandlers/PlayerHandlers.cs
index 9b785bb..f2bd9b9 100644
--- a/Common Utilities/EventHandlers/PlayerHandlers.cs	
+++ b/Common Utilities/EventHandlers/PlayerHandlers.cs	
@@ -1,7 +1,3 @@
-using System.Collections.Specialized;
-using Exiled.Permissions;
-using Exiled.Permissions.Features;
-
 namespace Common_Utilities.EventHandlers;
 
 #pragma warning disable IDE0018
@@ -14,8 +10,6 @@ namespace Common_Utilities.EventHandlers;
 using Exiled.CustomItems.API.Features;
 using Exiled.Events.EventArgs.Interfaces;
 using Exiled.Events.EventArgs.Player;
-using LabApi.Features.Permissions;
-using LabApi.Features.Permissions.Providers;
 using PlayerRoles;
 using UnityEngine;