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

Fix merge conflicts

Browse Source
This commit is contained in:
VegaZ
2018-10-22 20:22:45 +02:00
parent 80f23866f7 e8caca16eb
commit 08646c723d
11 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Server/Events/Death.cs
View File

@@ -69,8 +69,11 @@ namespace reallife_gamemode.Server.Events
killerPosY = killer.Position.Y;
killerPosZ = killer.Position.Z;
killerHeading = killer.Heading;
string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + NAPI.Player.GetPlayerCurrentWeapon(killer) + ")";
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
if(player != killer)
{
string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + NAPI.Player.GetPlayerCurrentWeapon(killer) + ")";
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
}
}
using (var userDeath = new DatabaseContext())

14
Server/Events/Login.cs
View File

@@ -69,7 +69,19 @@ namespace reallife_gamemode.Server.Events
var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id);
userBankAccount.Balance = userBankAccount.Balance;
player.TriggerEvent("draw", player.Name, player.Handle.Value);
player.TriggerEvent("draw", player.Name, player.Handle.Value);
if (user.Dead == true)
{
//player.TriggerEvent("startDeathTimer");
//player.SetData("isDead", true);
//TODO: Deathlog entfernen
player.Health = 0;
}
else
{
player.SetData("isDead", false);
}
}
}
}