Skip to content

Commit 1680000

Browse files
committed
Fix for #59 & update EXILED References
1 parent cdeae3f commit 1680000

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

CustomItems/Components/Rock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public override void ProcessCollision(Collision collision)
7171
if (Player.Get(collision.collider.GetComponentInParent<ReferenceHub>()) is Player target && (target.Side != Side || FriendlyFire))
7272
{
7373
target.Hurt(ThrownDamage, DamageTypes.Wall, "ROCK");
74-
Player.Get(Owner).ShowHitMarker();
74+
Player.Get(Owner).ShowHitMarker(1f);
7575
}
7676

7777
CustomItem.Registered.First(customItem => customItem.Name == "Rock").Spawn(collision.GetContact(0).point + Vector3.up);

CustomItems/CustomItems.csproj

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,40 +53,40 @@
5353
<Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
5454
<HintPath>$(EXILED_REFERENCES)\CommandSystem.Core.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Exiled.API, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
57-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.API.dll</HintPath>
56+
<Reference Include="Exiled.API, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
57+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.API.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="Exiled.Bootstrap, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
61-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Bootstrap.dll</HintPath>
60+
<Reference Include="Exiled.Bootstrap, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
61+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Bootstrap.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="Exiled.CreditTags, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
65-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.CreditTags.dll</HintPath>
64+
<Reference Include="Exiled.CreditTags, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
65+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CreditTags.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
68-
<Reference Include="Exiled.CustomItems, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
69-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.CustomItems.dll</HintPath>
68+
<Reference Include="Exiled.CustomItems, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
69+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CustomItems.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
72-
<Reference Include="Exiled.CustomRoles, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
73-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.CustomRoles.dll</HintPath>
72+
<Reference Include="Exiled.CustomRoles, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
73+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CustomRoles.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
76-
<Reference Include="Exiled.Events, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
77-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Events.dll</HintPath>
76+
<Reference Include="Exiled.Events, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
77+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Events.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
80-
<Reference Include="Exiled.Loader, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
81-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Loader.dll</HintPath>
80+
<Reference Include="Exiled.Loader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
81+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Loader.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
84-
<Reference Include="Exiled.Permissions, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
85-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Permissions.dll</HintPath>
84+
<Reference Include="Exiled.Permissions, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
85+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Permissions.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
<Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
89-
<HintPath>..\packages\EXILED.3.1.1\lib\net472\Exiled.Updater.dll</HintPath>
89+
<HintPath>..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Updater.dll</HintPath>
9090
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">

CustomItems/Items/AutoGun.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected override void OnShooting(ShootingEventArgs ev)
9696
player.Hurt(Damage, DamageTypes.Com15, ev.Shooter.Nickname, ev.Shooter.Id);
9797
if (player.IsDead)
9898
player.ShowHint("<color=#FF0000>YOU HAVE BEEN KILLED BY AUTO AIM GUN</color>");
99-
ev.Shooter.ShowHitMarker();
99+
ev.Shooter.ShowHitMarker(1f);
100100
}
101101

102102
if (PerHitAmmo)

CustomItems/Items/TranquilizerGun.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private IEnumerator<float> DoTranquilize(Player player, float duration)
197197
Log.Error($"{nameof(DoTranquilize)}: {e}");
198198
}
199199

200-
Ragdoll ragdoll = Ragdoll.Spawn(player, DamageTypes.None, oldPosition, allowRecall: false);
200+
Ragdoll ragdoll = Ragdoll.Spawn(player, DamageTypes.None, oldPosition, default, default, false, false);
201201

202202
player.IsInvisible = true;
203203
player.Scale = Vector3.one * 0.2f;

CustomItems/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EXILED" version="3.1.1" targetFramework="net472" />
3+
<package id="EXILED" version="3.6.0-beta" targetFramework="net472" />
44
<package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
55
<package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
66
</packages>

0 commit comments

Comments
 (0)