Skip to content

Commit

Permalink
2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
IkaOverride committed Feb 5, 2024
1 parent ca0a513 commit de8b797
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
7 changes: 2 additions & 5 deletions ShootingInteractions/EventsHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,8 @@ public static void Interact(Player player, GameObject gameObject) {
_ => new TimedProjectileInteraction() { IsEnabled = false }
};

if (!grenadeInteraction.IsEnabled || !InventoryItemLoader.AvailableItems.TryGetValue(grenadePickup.Info.ItemId, out ItemBase grenadeBase))
return;

// Get the grenade as a throwable and return if it's null
if (grenadeBase is not ThrowableItem grenadeThrowable)
// Return if the interaction isn't enabled, it can't get the grenade base, or it can't get the throwable
if (!grenadeInteraction.IsEnabled || !InventoryItemLoader.AvailableItems.TryGetValue(grenadePickup.Info.ItemId, out ItemBase grenadeBase) || (grenadeBase is not ThrowableItem grenadeThrowable))
return;

// Instantiate the projectile
Expand Down
4 changes: 2 additions & 2 deletions ShootingInteractions/Plugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ public class Plugin : Plugin<Config> {

public override string Author => "Ika";

public override Version RequiredExiledVersion => new(8, 4, 3);
public override Version RequiredExiledVersion => new(8, 7, 3);

public override Version Version => new(2, 3, 0);
public override Version Version => new(2, 3, 1);

private EventsHandler eventsHandler;

Expand Down
15 changes: 9 additions & 6 deletions ShootingInteractions/ShootingInteractions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
<ItemGroup>
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Steam\steamapps\common\SCP Secret Laboratory Dedicated Server\SCPSL_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>..\..\..\..\..\Packages\Exiled-8.7.3\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Steam\steamapps\common\SCP Secret Laboratory Dedicated Server\SCPSL_Data\Managed\Mirror.dll</HintPath>
<HintPath>..\..\..\..\..\Packages\Exiled-8.7.3\Mirror.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -51,14 +51,17 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
<Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\Packages\Exiled-8.7.3\UnityEngine.AudioModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Steam\steamapps\common\SCP Secret Laboratory Dedicated Server\SCPSL_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\..\..\..\Packages\Exiled-8.7.3\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Steam\steamapps\common\SCP Secret Laboratory Dedicated Server\SCPSL_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>..\..\..\..\..\Packages\Exiled-8.7.3\UnityEngine.PhysicsModule.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -75,7 +78,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EXILED">
<Version>8.4.3</Version>
<Version>8.7.3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down

0 comments on commit de8b797

Please sign in to comment.