Fix merge conflicts

This commit is contained in:
VegaZ
2018-10-22 20:22:45 +02:00
11 changed files with 85 additions and 4 deletions

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())