diff --git a/AdminTools/AdminTools.csproj b/AdminTools/AdminTools.csproj
index f5a052f..3b511c4 100644
--- a/AdminTools/AdminTools.csproj
+++ b/AdminTools/AdminTools.csproj
@@ -43,36 +43,40 @@
..\..\References\CommandSystem.Core.dll
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.API.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.API.dll
True
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Bootstrap.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Bootstrap.dll
True
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CreditTags.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.CreditTags.dll
True
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CustomItems.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.CustomItems.dll
True
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Events.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.CustomRoles.dll
True
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Loader.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Events.dll
True
-
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Permissions.dll
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Loader.dll
+ True
+
+
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Permissions.dll
True
- ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Updater.dll
+ ..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Updater.dll
True
diff --git a/AdminTools/Commands/Explode/Explode.cs b/AdminTools/Commands/Explode/Explode.cs
index 146d29d..af8d114 100644
--- a/AdminTools/Commands/Explode/Explode.cs
+++ b/AdminTools/Commands/Explode/Explode.cs
@@ -50,7 +50,7 @@ protected override bool ExecuteParent(ArraySegment arguments, ICommandSe
if (ply.Role == RoleType.Spectator || ply.Role == RoleType.None)
continue;
- ply.Kill();
+ ply.Kill("Exploded by admin.");
new ExplosiveGrenade(ItemType.GrenadeHE, ply){ FuseTime = 0f }.SpawnActive(ply.Position, ply);
}
response = "Everyone exploded, Hubert cannot believe you have done this";
@@ -75,7 +75,7 @@ protected override bool ExecuteParent(ArraySegment arguments, ICommandSe
return false;
}
- pl.Kill();
+ pl.Kill("Exploded by admin.");
new ExplosiveGrenade(ItemType.GrenadeHE, pl){ FuseTime = 0f }.SpawnActive(pl.Position, pl);
response = $"Player \"{pl.Nickname}\" game ended (exploded)";
return true;
diff --git a/AdminTools/Commands/Hp/Hp.cs b/AdminTools/Commands/Hp/Hp.cs
index 3e69240..042479f 100644
--- a/AdminTools/Commands/Hp/Hp.cs
+++ b/AdminTools/Commands/Hp/Hp.cs
@@ -46,7 +46,7 @@ protected override bool ExecuteParent(ArraySegment arguments, ICommandSe
foreach (Player pl in Player.List)
{
if (value <= 0)
- pl.Kill();
+ pl.Kill("Killed by admin.");
else
pl.Health = value;
}
@@ -68,7 +68,7 @@ protected override bool ExecuteParent(ArraySegment arguments, ICommandSe
}
if (val <= 0)
- ply.Kill();
+ ply.Kill("Killed by admin.");
else
ply.Health = val;
response = $"Player {ply.Nickname}'s HP was set to {val}";
diff --git a/AdminTools/Commands/Kill/Kill.cs b/AdminTools/Commands/Kill/Kill.cs
index d26ee5e..70ec330 100644
--- a/AdminTools/Commands/Kill/Kill.cs
+++ b/AdminTools/Commands/Kill/Kill.cs
@@ -42,7 +42,7 @@ protected override bool ExecuteParent(ArraySegment arguments, ICommandSe
if (ply.Role == RoleType.Spectator || ply.Role == RoleType.None)
continue;
- ply.Kill();
+ ply.Kill("Killed by admin.");
}
response = "Everyone has been game ended (killed) now";
@@ -60,7 +60,7 @@ protected override bool ExecuteParent(ArraySegment arguments, ICommandSe
return false;
}
- pl.Kill();
+ pl.Kill("Killed by admin.");
response = $"Player {pl.Nickname} has been game ended (killed) now";
return true;
}
diff --git a/AdminTools/EventHandlers.cs b/AdminTools/EventHandlers.cs
index 9ddf058..d11ff21 100644
--- a/AdminTools/EventHandlers.cs
+++ b/AdminTools/EventHandlers.cs
@@ -24,6 +24,7 @@ namespace AdminTools
using InventorySystem.Items.Firearms.Attachments;
using InventorySystem.Items.Pickups;
using InventorySystem.Items.ThrowableProjectiles;
+ using PlayerStatsSystem;
using Ragdoll = Exiled.API.Features.Ragdoll;
public class EventHandlers
@@ -84,7 +85,7 @@ public static IEnumerator SpawnBodies(Player player, RoleType role, int c
{
for (int i = 0; i < count; i++)
{
- Ragdoll.Spawn(role, DamageTypes.Falldown, "SCP-343", player.Position, default, default, false, 0);
+ Ragdoll.Spawn(new RagdollInfo(Server.Host.ReferenceHub, new UniversalDamageHandler(0.0f, DeathTranslations.Unknown, string.Empty), role, player.Position, default, "SCP-343", 0));
yield return Timing.WaitForSeconds(0.15f);
}
}
@@ -210,7 +211,7 @@ public static IEnumerator DoRocket(Player player, float speed)
{
player.IsGodModeEnabled = false;
new ExplosiveGrenade(ItemType.GrenadeHE) {FuseTime = 0.5f}.SpawnActive(player.Position, player);
- player.Kill();
+ player.Kill("Went on a trip in their favorite rocket ship.");
}
yield return Timing.WaitForOneFrame;
diff --git a/AdminTools/Properties/AssemblyInfo.cs b/AdminTools/Properties/AssemblyInfo.cs
index a3f54b4..b7610a9 100644
--- a/AdminTools/Properties/AssemblyInfo.cs
+++ b/AdminTools/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.4.0")]
-[assembly: AssemblyFileVersion("3.0.4.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("4.0.0.0")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
\ No newline at end of file
diff --git a/AdminTools/packages.config b/AdminTools/packages.config
index c8b8dcc..5de5ac4 100644
--- a/AdminTools/packages.config
+++ b/AdminTools/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file