From 168000052592a1ae2b2ae29cdfab86b410c7f3bd Mon Sep 17 00:00:00 2001 From: Joker Date: Sun, 7 Nov 2021 01:38:27 -0800 Subject: [PATCH] Fix for #59 & update EXILED References --- CustomItems/Components/Rock.cs | 2 +- CustomItems/CustomItems.csproj | 34 ++++++++++++++-------------- CustomItems/Items/AutoGun.cs | 2 +- CustomItems/Items/TranquilizerGun.cs | 2 +- CustomItems/packages.config | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CustomItems/Components/Rock.cs b/CustomItems/Components/Rock.cs index 25e7dc6..6879fd8 100644 --- 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()) 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 index f06052f..bf7a723 100644 --- a/CustomItems/CustomItems.csproj +++ b/CustomItems/CustomItems.csproj @@ -53,40 +53,40 @@ $(EXILED_REFERENCES)\CommandSystem.Core.dll - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.API.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.API.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.Bootstrap.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Bootstrap.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.CreditTags.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CreditTags.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.CustomItems.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CustomItems.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.CustomRoles.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.CustomRoles.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.Events.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Events.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.Loader.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Loader.dll True - - ..\packages\EXILED.3.1.1\lib\net472\Exiled.Permissions.dll + + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Permissions.dll True - ..\packages\EXILED.3.1.1\lib\net472\Exiled.Updater.dll + ..\packages\EXILED.3.6.0-beta\lib\net472\Exiled.Updater.dll True diff --git a/CustomItems/Items/AutoGun.cs b/CustomItems/Items/AutoGun.cs index 6c2a5b6..f0ea9b1 100644 --- 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("YOU HAVE BEEN KILLED BY AUTO AIM GUN"); - ev.Shooter.ShowHitMarker(); + ev.Shooter.ShowHitMarker(1f); } if (PerHitAmmo) diff --git a/CustomItems/Items/TranquilizerGun.cs b/CustomItems/Items/TranquilizerGun.cs index 0f60a56..2a8805d 100644 --- a/CustomItems/Items/TranquilizerGun.cs +++ b/CustomItems/Items/TranquilizerGun.cs @@ -197,7 +197,7 @@ private IEnumerator 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 index 5bca6db..4953406 100644 --- a/CustomItems/packages.config +++ b/CustomItems/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file