diff --git a/Model/DatabaseContext.cs b/Model/DatabaseContext.cs index 7cb35714..22d87bf1 100644 --- a/Model/DatabaseContext.cs +++ b/Model/DatabaseContext.cs @@ -42,6 +42,7 @@ namespace reallife_gamemode.Model public DbSet BankAccounts { get; set; } //Logs + //public DbSet BanLogs { get; set; } public DbSet BankAccountTransactionLogs { get; set; } public DbSet DeathLogs { get; set; } diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 88998cb9..7ee9ddc4 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -62,7 +62,6 @@ namespace reallife_gamemode.Server.Commands Vehicle v = NAPI.Vehicle.CreateVehicle(hash, player.Position, player.Rotation.Z, color1, color2); player.SetIntoVehicle(v.Handle, -1); - player.SendChatMessage("Maxspeed: + " +player.Vehicle.MaxSpeed + ""); } [Command("fv")] diff --git a/Server/Entities/Ban.cs b/Server/Entities/Ban.cs new file mode 100644 index 00000000..895c4a27 --- /dev/null +++ b/Server/Entities/Ban.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using reallife_gamemode.Server.Entities; + +/** +* @overview Life of German Reallife - Entities Ban (Ban.cs) +* @author VegaZ +* @copyright (c) 2008 - 2018 Life of German +*/ + +namespace reallife_gamemode.Server.Entities +{ + public class Ban + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + + [ForeignKey("User")] + public int UserId { get; set; } + public User User { get; set; } + + public string Reason { get; set; } + public string BannedBy { get; set; } + public byte[] UntilDateTime { get; set; } + } +} diff --git a/Server/Entities/User.cs b/Server/Entities/User.cs index f119e2fa..9bb71bab 100644 --- a/Server/Entities/User.cs +++ b/Server/Entities/User.cs @@ -36,6 +36,10 @@ namespace reallife_gamemode.Server.Entities public float PositionY { get; set; } public float PositionZ { get; set; } + [ForeignKey("Ban")] + public int? BanId { get; set; } + public Ban Ban { get; set; } + public bool IsAdmin(AdminLevel level) => AdminLevel >= level; } } diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs index cecc87c0..62c3cd55 100644 --- a/Server/Events/Death.cs +++ b/Server/Events/Death.cs @@ -19,17 +19,18 @@ namespace reallife_gamemode.Server.Events [ServerEvent(Event.PlayerDeath)] public void OnPlayerDeath(Client player, Client killer, uint reason) { + //TODO: Zum Full Release entfernen NAPI.Chat.SendChatMessageToPlayer(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString()); - var killerId = 0; - var killerPosX = 0f; - var killerPosY = 0f; - var killerPosZ = 0f; - var killerHeading = 0f; + int? killerId; + float killerPosX; + float killerPosY; + float killerPosZ; + float killerHeading; if (killer.IsNull) { - killerId = -1; + killerId = null; killerPosX = -1; killerPosY = -1; killerPosZ = -1;