Fix for #59 & update EXILED References

Exiled-Team · Nov 7, 2021 · 1680000 · 1680000
1 parent cdeae3f
commit 1680000
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/CustomItems/Components/Rock.cs b/CustomItems/Components/Rock.cs
@@ -71,7 +71,7 @@ public override void ProcessCollision(Collision collision)
                 if (Player.Get(collision.collider.GetComponentInParent<ReferenceHub>()) is Player target && (target.Side != Side || FriendlyFire))
                 {
                     target.Hurt(ThrownDamage, DamageTypes.Wall, "ROCK");
-                    Player.Get(Owner).ShowHitMarker();
+                    Player.Get(Owner).ShowHitMarker(1f);
                 }
 
                 CustomItem.Registered.First(customItem => customItem.Name == "Rock").Spawn(collision.GetContact(0).point + Vector3.up);

diff --git a/CustomItems/CustomItems.csproj b/CustomItems/CustomItems.csproj
@@ -53,40 +53,40 @@
     <Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>$(EXILED_REFERENCES)\CommandSystem.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.API, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.API.dll</HintPath>
+    <Reference Include="Exiled.API, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.API.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.Bootstrap, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Bootstrap.dll</HintPath>
+    <Reference Include="Exiled.Bootstrap, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Bootstrap.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.CreditTags, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.CreditTags.dll</HintPath>
+    <Reference Include="Exiled.CreditTags, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CreditTags.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.CustomItems, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.CustomItems.dll</HintPath>
+    <Reference Include="Exiled.CustomItems, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CustomItems.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.CustomRoles, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.CustomRoles.dll</HintPath>
+    <Reference Include="Exiled.CustomRoles, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CustomRoles.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.Events, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Events.dll</HintPath>
+    <Reference Include="Exiled.Events, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Events.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.Loader, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Loader.dll</HintPath>
+    <Reference Include="Exiled.Loader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Loader.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Exiled.Permissions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Permissions.dll</HintPath>
+    <Reference Include="Exiled.Permissions, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Permissions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Updater.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Updater.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">

diff --git a/CustomItems/Items/AutoGun.cs b/CustomItems/Items/AutoGun.cs
@@ -96,7 +96,7 @@ protected override void OnShooting(ShootingEventArgs ev)
                     player.Hurt(Damage, DamageTypes.Com15, ev.Shooter.Nickname, ev.Shooter.Id);
                     if (player.IsDead)
                         player.ShowHint("<color=#FF0000>YOU HAVE BEEN KILLED BY AUTO AIM GUN</color>");
-                    ev.Shooter.ShowHitMarker();
+                    ev.Shooter.ShowHitMarker(1f);
                 }
 
                 if (PerHitAmmo)

diff --git a/CustomItems/Items/TranquilizerGun.cs b/CustomItems/Items/TranquilizerGun.cs
@@ -197,7 +197,7 @@ private IEnumerator<float> DoTranquilize(Player player, float duration)
                 Log.Error($"{nameof(DoTranquilize)}: {e}");
             }
 
-            Ragdoll ragdoll = Ragdoll.Spawn(player, DamageTypes.None, oldPosition, allowRecall: false);
+            Ragdoll ragdoll = Ragdoll.Spawn(player, DamageTypes.None, oldPosition, default, default, false, false);
 
             player.IsInvisible = true;
             player.Scale = Vector3.one * 0.2f;

diff --git a/CustomItems/packages.config b/CustomItems/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EXILED" version="3.1.1" targetFramework="net472" />
+  <package id="EXILED" version="3.6.0-beta" targetFramework="net472" />
   <package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
   <package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
 </packages>