aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix freekh, change login death

Browse Source
This commit is contained in:
xSprite
2018-10-22 00:30:21 +02:00
parent 03dea88145
commit 5580d06b09
8 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/reallife-gamemode/DesignTimeBuild/.dtbcache Normal file
View File

Binary file not shown.

BIN
.vs/reallife-gamemode/v15/.suo Normal file
View File

Binary file not shown.

0
.vs/reallife-gamemode/v15/Server/sqlite3/db.lock Normal file
View File

BIN
.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide Normal file
View File

Binary file not shown.

BIN
.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-shm Normal file
View File

Binary file not shown.

BIN
.vs/reallife-gamemode/v15/Server/sqlite3/storage.ide-wal Normal file
View File

Binary file not shown.

12
Server/Commands/Admin.cs
View File

@@ -493,7 +493,7 @@ namespace reallife_gamemode.Server.Commands
player.SendChatMessage("~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt."); 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) public void CmdAdminRangeSetHP(Client player, float radius=9999999)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -506,7 +506,15 @@ namespace reallife_gamemode.Server.Commands
foreach (var managedClient in peopleInRange) foreach (var managedClient in peopleInRange)
{ {
if (!managedClient.IsLoggedIn()) return; 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.TriggerEvent("onPlayerRevived");
managedClient.SendNotification("Du wurdest von Admin ~y~" + player.Name + "~s~ wiederbelebt."); managedClient.SendNotification("Du wurdest von Admin ~y~" + player.Name + "~s~ wiederbelebt.");
managedClient.SetData("isDead", false); managedClient.SetData("isDead", false);

6
Server/Events/Login.cs
View File

@@ -52,8 +52,10 @@ namespace reallife_gamemode.Server.Events
if (user.Dead == true) if (user.Dead == true)
{ {
player.TriggerEvent("startDeathTimer"); //player.TriggerEvent("startDeathTimer");
player.SetData("isDead", true); //player.SetData("isDead", true);
//TODO: Deathlog entfernen
player.Health = 0;
} }
else else
{ {