diff --git a/.vs/reallife-gamemode/DesignTimeBuild/.dtbcache b/.vs/reallife-gamemode/DesignTimeBuild/.dtbcache new file mode 100644 index 00000000..df416155 Binary files /dev/null and b/.vs/reallife-gamemode/DesignTimeBuild/.dtbcache differ diff --git a/.vs/reallife-gamemode/v15/.suo b/.vs/reallife-gamemode/v15/.suo new file mode 100644 index 00000000..7cbb4264 Binary files /dev/null and b/.vs/reallife-gamemode/v15/.suo differ diff --git a/.vs/reallife-gamemode/v15/Server/sqlite3/db.lock b/.vs/reallife-gamemode/v15/Server/sqlite3/db.lock new file mode 100644 index 00000000..e69de29b diff --git a/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide b/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide new file mode 100644 index 00000000..791a3855 Binary files /dev/null and b/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-shm b/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-shm new file mode 100644 index 00000000..4e76a645 Binary files /dev/null and b/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-wal b/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-wal new file mode 100644 index 00000000..23fbdf75 Binary files /dev/null and b/.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index ac7ec586..e34faa55 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -493,7 +493,7 @@ namespace reallife_gamemode.Server.Commands player.SendChatMessage("~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt."); } - [Command("rfreekh", "~m~Benutzung: ~s~/freekh (Radius)")] + [Command("freekh", "~m~Benutzung: ~s~/freekh (Radius)")] public void CmdAdminRangeSetHP(Client player, float radius=9999999) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) @@ -506,7 +506,15 @@ namespace reallife_gamemode.Server.Commands foreach (var managedClient in peopleInRange) { if (!managedClient.IsLoggedIn()) return; - managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " alle Spieler wiederbelebt"); + if (!managedClient.HasData("isDead")) return; + if (radius == 9999999) + { + managedClient.SendChatMessage("~b~Admin " + player.Name + " alle Spieler wiederbelebt"); + } + else + { + managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " alle Spieler wiederbelebt"); + } managedClient.TriggerEvent("onPlayerRevived"); managedClient.SendNotification("Du wurdest von Admin ~y~" + player.Name + "~s~ wiederbelebt."); managedClient.SetData("isDead", false); diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs index e04e5d42..710dbee2 100644 --- a/Server/Events/Login.cs +++ b/Server/Events/Login.cs @@ -52,8 +52,10 @@ namespace reallife_gamemode.Server.Events if (user.Dead == true) { - player.TriggerEvent("startDeathTimer"); - player.SetData("isDead", true); + //player.TriggerEvent("startDeathTimer"); + //player.SetData("isDead", true); + //TODO: Deathlog entfernen + player.Health = 0; } else {