0Harmony library, clearance of the code

Author: Sl4vP0weR

AntiLock.csproj

@@ -26,39 +26,49 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\Release\Plugins\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony_new">
-      <HintPath>..\0Harmony_new.dll</HintPath>
+    <Reference Include="0Harmony">
+      <HintPath>Libraries\0Harmony2.0.2.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
+    <!-- Make your paths here or in Visual Studio -->
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Rocket.API">
       <HintPath>..\Rocket.API.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Rocket.Core">
       <HintPath>..\Rocket.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Rocket.Unturned">
       <HintPath>..\Rocket.Unturned.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SDG.Glazier.Runtime">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\SDG.Glazier.Runtime.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SDG.NetPak.Runtime">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\SDG.NetPak.Runtime.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SDG.NetTransport">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\SDG.NetTransport.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Steamworks.NET">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\Steamworks.NET.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -68,12 +78,15 @@
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\UnityEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule">
       <HintPath>..\..\..\Steam\steamapps\common\U3DS\Unturned_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -83,5 +96,10 @@
     <Compile Include="CommandClearLocks.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <None Include="Libraries\0Harmony2.0.2.0.dll" />
+    <None Include="Libraries\0Harmony2.0.2.0.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

AskVehicleLockOverride.cs

@@ -25,7 +25,7 @@ static bool Check(ServerInvocationContext context)
             if (!vehicle?.checkDriver(steamID) ?? true) // not in the vehicle or aren't a driver
                 return false;
 
-            if (vehicle.isLocked)
+            if (vehicle.isLocked) // locked
                 return true;
 
             var group = conf.LockGroups
@@ -34,11 +34,11 @@ static bool Check(ServerInvocationContext context)
                 .LastOrDefault();
 
             int max = group == null ? conf.DefaultMaxLocks : group.MaxLocks;
-            int count = VehicleManager.vehicles.Count(x => x.lockedOwner == steamID && x.isLocked);
+            int lockedVehiclesCount = VehicleManager.vehicles.Count(x => x.lockedOwner == steamID && x.isLocked);
 
-            var maxLocks = count >= max && conf.DisplayMaxlocksNotice;
+            var maxLocks = lockedVehiclesCount >= max && conf.DisplayMaxlocksNotice; // is locked max value of vehicles
             var msg = maxLocks ? inst.Translate(MaxLockedNotice, max) :
-                    (conf.DisplayLockNotice ? inst.Translate(LockedNotice, max - count - 1, max) : null);
+                    (conf.DisplayLockNotice ? inst.Translate(LockedNotice, max - lockedVehiclesCount - 1, max) : null);
             var color = maxLocks ? Color.red : Color.green;
 
             UnturnedChat.Say(up, msg, color);

CommandClearLocks.cs

@@ -8,6 +8,7 @@
 using static AntiLock.Main;
 using System;
 using Steamworks;
+using System.Linq;
 
 namespace AntiLock
 {
@@ -55,21 +56,13 @@ public void Execute(IRocketPlayer caller, string[] args)
         }
 
         /// <returns>Amount of cleared locks</returns>
-        int ClearLocks(UnturnedPlayer up)
-        {
-            int count = 0;
-            if (up != null)
+        int ClearLocks(UnturnedPlayer up) => up != null ?
+            VehicleManager.vehicles.Select(v =>
             {
-                foreach (var v in VehicleManager.vehicles)
-                {
-                    if (v.lockedOwner == up.CSteamID && v.isLocked)
-                    {
-                        VehicleManager.ServerSetVehicleLock(v, CSteamID.Nil, CSteamID.Nil, false);
-                        count++;
-                    }
-                }
-            }
-            return count;
-        }
+                var unlock = v.lockedOwner == up.CSteamID && v.isLocked;
+                if (unlock)
+                    VehicleManager.ServerSetVehicleLock(v, CSteamID.Nil, CSteamID.Nil, false);
+                return unlock ? 1 : 0;
+            }).Sum() : 0;
     }
 }