Code formatiert

ReallifeGamemode.DataService/Controllers/AuthController.cs

@@ -34,7 +34,7 @@ namespace ReallifeGamemode.DataService.Controllers
 
       string token = tokenGenerator.GenerateUserToken(user);
 
-      if(string.IsNullOrEmpty(token))
+      if (string.IsNullOrEmpty(token))
       {
         return Unauthorized();
       }

ReallifeGamemode.DataService/Controllers/LocationController.cs

@@ -30,7 +30,7 @@ namespace ReallifeGamemode.DataService.Controllers
 
       List<string> locations = new List<string>();
 
-      foreach(var location in list)
+      foreach (var location in list)
       {
         string description = location.Description;
         description = Regex.Replace(description, @"<[^>]*(>|$)", string.Empty);

ReallifeGamemode.DataService/Controllers/UserController.cs

@@ -33,7 +33,7 @@ namespace ReallifeGamemode.DataService.Controllers
     {
       User user = dbContext.Users.Where(u => u.Id == UserId).FirstOrDefault();
 
-      if(user == null)
+      if (user == null)
       {
         return NotFound();
       }

ReallifeGamemode.DataService/Logic/JwtTokenGenerator.cs

@@ -27,7 +27,7 @@ namespace ReallifeGamemode.DataService.Logic
 
     public string GenerateUserToken(User user)
     {
-      if(user == null)
+      if (user == null)
       {
         return null;
       }

ReallifeGamemode.DataService/Logic/LogicBase.cs

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.DataService.Logic
     {
       Type[] types = Assembly.GetExecutingAssembly().GetTypes().Where(t => t.IsSubclassOf(typeof(LogicBase)) && !t.IsAbstract).ToArray();
 
-      foreach(Type type in types)
+      foreach (Type type in types)
       {
         services = services.AddScoped(type);
       }

ReallifeGamemode.Database/Migrations/20190922163450_WeaponDealTimer.cs

@@ -2,34 +2,34 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class WeaponDealTimer : Migration
+  public partial class WeaponDealTimer : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "WeaponDealTime",
-                table: "Factions",
-                nullable: false,
-                defaultValue: 0);
+      migrationBuilder.AddColumn<int>(
+          name: "WeaponDealTime",
+          table: "Factions",
+          nullable: false,
+          defaultValue: 0);
 
-            migrationBuilder.AlterColumn<int>(
-              name: "PaydayTimer",
-              table: "Users",
-              nullable: false,
-              defaultValue: 60);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "WeaponDealTime",
-                table: "Factions");
-
-            migrationBuilder.AlterColumn<int>(
-              name: "PaydayTimer",
-              table: "Users",
-              nullable: false,
-              defaultValue: 0);
-        }
+      migrationBuilder.AlterColumn<int>(
+        name: "PaydayTimer",
+        table: "Users",
+        nullable: false,
+        defaultValue: 60);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "WeaponDealTime",
+          table: "Factions");
+
+      migrationBuilder.AlterColumn<int>(
+        name: "PaydayTimer",
+        table: "Users",
+        nullable: false,
+        defaultValue: 0);
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20190929200617_SavedLocations.cs

@@ -3,31 +3,31 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class SavedLocations : Migration
+  public partial class SavedLocations : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Locations",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    Description = table.Column<string>(nullable: true),
-                    X = table.Column<double>(nullable: false),
-                    Y = table.Column<double>(nullable: false),
-                    Z = table.Column<double>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Locations", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Locations");
-        }
+      migrationBuilder.CreateTable(
+          name: "Locations",
+          columns: table => new
+          {
+            Id = table.Column<int>(nullable: false)
+                  .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+            Description = table.Column<string>(nullable: true),
+            X = table.Column<double>(nullable: false),
+            Y = table.Column<double>(nullable: false),
+            Z = table.Column<double>(nullable: false)
+          },
+          constraints: table =>
+          {
+            table.PrimaryKey("PK_Locations", x => x.Id);
+          });
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropTable(
+          name: "Locations");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20190929202101_FactionWeaponAmount.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class FactionWeaponAmount : Migration
+  public partial class FactionWeaponAmount : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "Ammount",
-                table: "FactionWeapons",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Ammount",
-                table: "FactionWeapons");
-        }
+      migrationBuilder.AddColumn<int>(
+          name: "Ammount",
+          table: "FactionWeapons",
+          nullable: false,
+          defaultValue: 0);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "Ammount",
+          table: "FactionWeapons");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20190929202856_SavedLocationsHeading.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class SavedLocationsHeading : Migration
+  public partial class SavedLocationsHeading : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<double>(
-                name: "Heading",
-                table: "Locations",
-                nullable: false,
-                defaultValue: 0.0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Heading",
-                table: "Locations");
-        }
+      migrationBuilder.AddColumn<double>(
+          name: "Heading",
+          table: "Locations",
+          nullable: false,
+          defaultValue: 0.0);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "Heading",
+          table: "Locations");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20191017200636_gtavdev-db.cs

@@ -2,16 +2,16 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class gtavdevdb : Migration
+  public partial class gtavdevdb : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
 
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20191030183018_DriverLicenseVehicle.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class DriverLicenseVehicle : Migration
+  public partial class DriverLicenseVehicle : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "DriverLicenseVehicle",
-                table: "Users",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DriverLicenseVehicle",
-                table: "Users");
-        }
+      migrationBuilder.AddColumn<bool>(
+          name: "DriverLicenseVehicle",
+          table: "Users",
+          nullable: false,
+          defaultValue: false);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "DriverLicenseVehicle",
+          table: "Users");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20191030203114_FlyingLicensePlane.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class FlyingLicensePlane : Migration
+  public partial class FlyingLicensePlane : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "FlyingLicensePlane",
-                table: "Users",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "FlyingLicensePlane",
-                table: "Users");
-        }
+      migrationBuilder.AddColumn<bool>(
+          name: "FlyingLicensePlane",
+          table: "Users",
+          nullable: false,
+          defaultValue: false);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "FlyingLicensePlane",
+          table: "Users");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20191101144543_SchoolId.cs

@@ -2,21 +2,21 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class SchoolId : Migration
+  public partial class SchoolId : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "SchoolId",
-                table: "ServerVehicles",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SchoolId",
-                table: "ServerVehicles");
-        }
+      migrationBuilder.AddColumn<int>(
+          name: "SchoolId",
+          table: "ServerVehicles",
+          nullable: true);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "SchoolId",
+          table: "ServerVehicles");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20191101204247_DriverLicenseBike.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class DriverLicenseBike : Migration
+  public partial class DriverLicenseBike : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "DriverLicenseBike",
-                table: "Users",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DriverLicenseBike",
-                table: "Users");
-        }
+      migrationBuilder.AddColumn<bool>(
+          name: "DriverLicenseBike",
+          table: "Users",
+          nullable: false,
+          defaultValue: false);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "DriverLicenseBike",
+          table: "Users");
+    }
+  }
 }

ReallifeGamemode.Database/Migrations/20191129201024_Turfs.cs

@@ -3,35 +3,35 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class Turfs : Migration
+  public partial class Turfs : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Turfs",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    FactionId = table.Column<int>(nullable: true),
-                    Owner = table.Column<string>(nullable: true),
-                    Name = table.Column<string>(nullable: true),
-                    X = table.Column<int>(nullable: false),
-                    Y = table.Column<int>(nullable: false),
-                    Rotation = table.Column<float>(nullable: false),
-                    Range = table.Column<float>(nullable: false),
-                    Color = table.Column<int>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Turfs", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Turfs");
-        }
+      migrationBuilder.CreateTable(
+          name: "Turfs",
+          columns: table => new
+          {
+            Id = table.Column<int>(nullable: false)
+                  .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+            FactionId = table.Column<int>(nullable: true),
+            Owner = table.Column<string>(nullable: true),
+            Name = table.Column<string>(nullable: true),
+            X = table.Column<int>(nullable: false),
+            Y = table.Column<int>(nullable: false),
+            Rotation = table.Column<float>(nullable: false),
+            Range = table.Column<float>(nullable: false),
+            Color = table.Column<int>(nullable: false)
+          },
+          constraints: table =>
+          {
+            table.PrimaryKey("PK_Turfs", x => x.Id);
+          });
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropTable(
+          name: "Turfs");
+    }
+  }
 }

ReallifeGamemode.Server/Business/BusinessBase.cs

@@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Business
 
       BusinessData data = GetData();
 
-      if(data == null)
+      if (data == null)
       {
         using (var dbContext = new DatabaseContext())
         {
@@ -93,7 +93,7 @@ namespace ReallifeGamemode.Server.Business
 
     public BusinessData GetData(DatabaseContext dbContext = null)
     {
-      if(dbContext == null)
+      if (dbContext == null)
       {
         using (dbContext = new DatabaseContext())
         {

ReallifeGamemode.Server/Business/HelicopterDealerBusiness.cs

@@ -11,9 +11,9 @@ namespace ReallifeGamemode.Server.Business
 
     public override string Name => "Helikopter Shop";
 
-    public override Vector3 Position => new Vector3(-700.6019,- 1401.571, 5.495285);
+    public override Vector3 Position => new Vector3(-700.6019, -1401.571, 5.495285);
 
-    public override Vector3 CarSpawnPositon => new Vector3(-745.4077, - 1468.357, 5.00052);
+    public override Vector3 CarSpawnPositon => new Vector3(-745.4077, -1468.357, 5.00052);
 
     public override float CarSpawnHeading => 356.6f;
 

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -1951,7 +1951,7 @@ namespace ReallifeGamemode.Server.Commands
               ChatService.SendMessage(player, "~m~Benutzung: ~s~/save schoolvehicle [FahrschuleID]");
               return;
             }
-            if(drivingSchoolId > 2  || drivingSchoolId < 0)
+            if (drivingSchoolId > 2 || drivingSchoolId < 0)
             {
               ChatService.SendMessage(player, "~m~Diese Fahrschule existiert nicht.");
               return;
@@ -1965,13 +1965,13 @@ namespace ReallifeGamemode.Server.Commands
           break;
 
         case "location":
-          if(option1 == null || option1.Length < 0)
+          if (option1 == null || option1.Length < 0)
           {
             ChatService.SendMessage(player, "~m~Benutzung: ~s~/save location [Beschreibung]");
             return;
           }
 
-          using(var dbContext = new DatabaseContext())
+          using (var dbContext = new DatabaseContext())
           {
             dbContext.Locations.Add(new Location
             {
@@ -2384,7 +2384,7 @@ namespace ReallifeGamemode.Server.Commands
         return;
       }
 
-      if(modifier < 0)
+      if (modifier < 0)
       {
         ChatService.ErrorMessage(player, "Es muss positives Adminspeed angegeben werden");
         return;
@@ -2989,7 +2989,7 @@ namespace ReallifeGamemode.Server.Commands
 
       BusinessBase business = BusinessManager.GetNearBusiness(player);
 
-      if(business == null)
+      if (business == null)
       {
         ChatService.ErrorMessage(player, "In deiner Nähe ist kein Business");
         return;
@@ -2998,7 +2998,7 @@ namespace ReallifeGamemode.Server.Commands
       switch (option.ToLower())
       {
         case "price":
-          if(!int.TryParse(option1, out int price))
+          if (!int.TryParse(option1, out int price))
           {
             ChatService.ErrorMessage(player, "Es muss ein gültiger Preis angegeben werden");
             return;

ReallifeGamemode.Server/Commands/UserCommands.cs

@@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Commands
         if (!managedClient.IsLoggedIn()) return;
         ChatService.SendMessage(managedClient, "* " + player.Name + " hat eine " + number + " gewürfelt.");
       }
-    }    
+    }
 
     [Command("car", "~m~Benutzung: ~s~/car")]
     public void CmdUserCar(Client player)

ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs

@@ -82,10 +82,10 @@ namespace ReallifeGamemode.Server.DrivingSchool
       }.AsReadOnly();
     private readonly IReadOnlyCollection<Vector3> StopCar = new List<Vector3>
       {
-      new Vector3(-788.66, -1278.75, 4),      
+      new Vector3(-788.66, -1278.75, 4),
       }.AsReadOnly();
 
-    
+
     public static void Setup()
     {
       informationLabel = NAPI.TextLabel.CreateTextLabel("Fahrschule\n~y~Auto ~s~- $~g~2500\n~y~Motorrad ~s~- $~g~3500", new Vector3(-813.17, -1354.5, 5.14), 20.0f, 1.3f, 0, new Color(255, 255, 255));
@@ -148,7 +148,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
           user.TriggerEvent("stopTimer");
           CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 1, 7, "drivingSchoolEvent");
         }
-        if(schoolVehicle.SchoolId == 2 && user.IsInVehicle)
+        if (schoolVehicle.SchoolId == 2 && user.IsInVehicle)
         {
           user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
           user.TriggerEvent("stopTimer");
@@ -202,7 +202,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
       {
         user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle.");
         CheckPointHandle.StartCheckPointRoute(user, StopCar, 5000, 1, 7, "drivingSchoolEventEnd");
-      }      
+      }
     }
 
 

ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs

@@ -72,7 +72,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
     public void StartplaneSchool(Client client)
     {
       User user = client.GetUser();
-      
+
       if (user.FlyingLicensePlane || client.HasData("ActiveSchool"))
         return;
 
@@ -101,7 +101,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
 
       if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle)
       {
-        if(schoolVehicle.SchoolId == 1)
+        if (schoolVehicle.SchoolId == 1)
         {
           user.TriggerEvent("renderTextOnScreen", "Fahren Sie langsam und sicher zur Roten Markierung.");
           user.TriggerEvent("stopTimer");
@@ -178,10 +178,10 @@ namespace ReallifeGamemode.Server.DrivingSchool
           CheckPointHandle.StartCheckPointRoute(user, planeRouteEnd, 5000, 6, 12, "planeSchoolEventEnd");
           break;
 
-         
+
       }
     }
 
-    
+
   }
 }

ReallifeGamemode.Server/Events/Connect.cs

@@ -23,8 +23,8 @@ namespace ReallifeGamemode.Server.Events
       player.SetData("isLoggedIn", false);
       player.Position = new Vector3(-1883.736, -781.4911, -10);
       player.FreezePosition = true;
-     
-      
+
+
       using (var dbContext = new DatabaseContext())
       {
         if (!dbContext.WhitelistEntries.Any(w => w.SocialClubName.ToLower() == player.SocialClubName.ToLower()))
@@ -40,7 +40,7 @@ namespace ReallifeGamemode.Server.Events
           return;
         }
       }
-      
+
 
       if (IsPlayerBanned(player)) return;
       player.TriggerEvent("SERVER:Login_ShowBrowser");

ReallifeGamemode.Server/Events/Death.cs

@@ -23,11 +23,11 @@ namespace ReallifeGamemode.Server.Events
     public void OnPlayerDeath(Client player, Client killer, uint reason)
     {
       if (!player.IsLoggedIn()) player.Kick();
-      player.SetData("isDead", true);      
+      player.SetData("isDead", true);
 
       //TODO: Zum Full Release entfernen
       ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString());
-      
+
       int? killerId;
       float killerPosX;
       float killerPosY;
@@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Events
         killerPosY = killer.Position.Y;
         killerPosZ = killer.Position.Z;
         killerHeading = killer.Heading;
-        if(player.HasData("inGangWar") && killer.HasData("inGangWar"))
+        if (player.HasData("inGangWar") && killer.HasData("inGangWar"))
         {
           Gangwar.Gangwar.GangwarKill(killer, player);
         }
@@ -57,13 +57,13 @@ namespace ReallifeGamemode.Server.Events
         if (player != killer)
         {
           Autowanted.Check_AutoWanted(killer, player);
-          string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason)+ ")";
+          string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason) + ")";
           ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
         }
       }
 
       User user = player.GetUser();
-      if(user.JailTime <= 0)
+      if (user.JailTime <= 0)
       {
         //MEDIC AUFTRAG
         MedicTask reviveTask = new MedicTask()
@@ -113,7 +113,7 @@ namespace ReallifeGamemode.Server.Events
 
 
 
-      
+
       //JailTime.cs
       Jail.Check_PutBehindBars(player);
 

ReallifeGamemode.Server/Events/Disconnect.cs

@@ -38,7 +38,7 @@ namespace ReallifeGamemode.Server.Events
       {
         NAPI.Util.ConsoleOutput(player.Name + " Timeoutet");
       }
-      
+
       if (GlobalHelper.DutyAdmins.Contains(player))
       {
         GlobalHelper.DutyAdmins.Remove(player);

ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs

@@ -29,7 +29,7 @@ namespace ReallifeGamemode.Server.Events
           if ((VehicleHash)vehicle.Model == VehicleHash.Burrito3)
           {
             if (WeaponDealManager.checkWeaponDbyVehicle(vehicle))
-              return;      
+              return;
           }
           player.StopAnimation();
           player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);

ReallifeGamemode.Server/Events/ExitVehicle.cs

@@ -10,7 +10,7 @@ using ReallifeGamemode.Server.WeaponDeal;
 
 namespace ReallifeGamemode.Server.Events
 {
-  public class ExitVehicle:Script
+  public class ExitVehicle : Script
   {
     [ServerEvent(Event.PlayerExitVehicleAttempt)]
     public void OnPlayerExitVehicle(Client client, GTANetworkAPI.Vehicle vehicle)

ReallifeGamemode.Server/Events/Inventory.cs

@@ -32,12 +32,12 @@ namespace ReallifeGamemode.Server.Events
               {
                 vehicleInventory = getVehItem(veh);
               }
-              client.TriggerEvent("setVehiclesInventory",  vehicleInventory.ToArray());
+              client.TriggerEvent("setVehiclesInventory", vehicleInventory.ToArray());
               return;
             }
           }
-        }       
-      }       
+        }
+      }
     }
 
     public List<VehicleInventory> getVehItem(GTANetworkAPI.Vehicle veh)

ReallifeGamemode.Server/Events/Key.cs

@@ -113,7 +113,7 @@ namespace ReallifeGamemode.Server.Events
       if (Economy.Paychecks.ContainsKey(u.Id)) paycheck = Economy.Paychecks[u.Id];
 
       Licenses licenses = new Licenses(u.DriverLicenseVehicle, u.DriverLicenseBike, u.FlyingLicensePlane);
-      
+
       var accountData = new
       {
         regDate = u.RegistrationDate.ToShortDateString(),
@@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Events
     {
       if (!player.IsLoggedIn()) return;
       var user = player.GetUser();
-     
+
 
       if (user?.FactionId != null)
       {
@@ -245,13 +245,13 @@ namespace ReallifeGamemode.Server.Events
 
           using (var context = new DatabaseContext())
           {
-            
+
 
             List<UserItem> fItem = context.UserItems.Where(u => u.UserId == user.Id).ToList();
-            foreach(var item in fItem)
+            foreach (var item in fItem)
             {
               IItem iItem = InventoryManager.GetItemById(item.ItemId);
-              if(iItem is IWeaponDealItem obj)
+              if (iItem is IWeaponDealItem obj)
               {
                 FactionWeapon weapon = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == iItem.Name).FirstOrDefault();
                 if (weapon == null)
@@ -267,7 +267,7 @@ namespace ReallifeGamemode.Server.Events
             Database.Entities.Faction faction = context.Factions.Where(fac => fac.Id == user.FactionId).FirstOrDefault();
 
             if (faction.WeaponDealTime > 0)
-              dealTime = "noch " + faction.WeaponDealTime.ToString()+" min. übrig";
+              dealTime = "noch " + faction.WeaponDealTime.ToString() + " min. übrig";
 
             timer.Add(dealTime);
 
@@ -296,7 +296,7 @@ namespace ReallifeGamemode.Server.Events
               }
             }
           }
-          
+
           player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), JsonConvert.SerializeObject(timer.ToArray()));
         }
         if (nearestJailReleasePoint != null)
@@ -309,16 +309,16 @@ namespace ReallifeGamemode.Server.Events
             if (c.JailTime > 0)
             {
               criminals.Add(c.Name);
-            }           
+            }
           }
           player.TriggerEvent("showJailMenu", JsonConvert.SerializeObject(criminals.ToArray()));
         }
         if (nearestElevatorPoint != null)
         {
           List<string> stages = new List<string>();
-          foreach(var e in PositionManager.ElevatorPoints)
+          foreach (var e in PositionManager.ElevatorPoints)
           {
-            if(e.Position.DistanceTo2D(player.Position) <= 25 && e.Position.DistanceTo(player.Position) > 1.5)
+            if (e.Position.DistanceTo2D(player.Position) <= 25 && e.Position.DistanceTo(player.Position) > 1.5)
             {
               stages.Add(e.Stage);
             }

ReallifeGamemode.Server/Events/Login.cs

@@ -58,7 +58,7 @@ namespace ReallifeGamemode.Server.Events
               player.SetData("editmode", false);
               player.SetData("quicksavemode", "none");
             }
-   
+
             var userBankAccount = user.GetBankAccount();
             userBankAccount.Balance = userBankAccount.Balance;
 
@@ -73,9 +73,10 @@ namespace ReallifeGamemode.Server.Events
             if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName))
             {
               ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.TEAM);
-            } else if (user.IsAdmin(AdminLevel.TEAM))
+            }
+            else if (user.IsAdmin(AdminLevel.TEAM))
             {
-              ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name +" [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM);
+              ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM);
             }
 
             var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();

ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs

@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Events
     public void SaveWeaponSelection(Client client, string stage)
     {
       ElevatorPoint elevator = PositionManager.ElevatorPoints.Find(e => e.Stage == stage);
-      if(elevator != null)
+      if (elevator != null)
       {
         client.Position = elevator.Position;
       }

ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events
     [RemoteEvent("updateWeaponSelection")]
     public void UpdateWeaponSelection(Client client, string weaponModel, int slot)
     {
-      if(weaponModel == "Keine")
+      if (weaponModel == "Keine")
       {
         client.RemoveAllWeapons();
         return;
@@ -38,14 +38,14 @@ namespace ReallifeGamemode.Server.Events
       if (slot == 4)
       {
         client.RemoveAllWeapons();
-        client.GiveWeapon(weaponHash, 0);      
+        client.GiveWeapon(weaponHash, 0);
       }
     }
 
     [RemoteEvent("cancelWeaponSelection")]
     public void CancelWeaponSelection(Client client)
     {
-      client.RemoveAllWeapons();    
+      client.RemoveAllWeapons();
     }
 
 
@@ -68,12 +68,12 @@ namespace ReallifeGamemode.Server.Events
         if (meleeModel.Contains("mk2") && !meleeModel.Contains("_mk2")) meleeModel = meleeModel.Replace("mk2", "_mk2");
         melee = NAPI.Util.GetHashKey($"weapon_{meleeModel}");
       }
-      
+
 
       client.GiveWeapon((WeaponHash)primary, 50);
       client.GiveWeapon((WeaponHash)secondary, 150);
       client.GiveWeapon((WeaponHash)melee, 1);
-      if(specialModel != "Schutzweste")
+      if (specialModel != "Schutzweste")
       {
         client.Armor = 0;
         if (!uint.TryParse(specialModel, out uint special))
@@ -87,8 +87,8 @@ namespace ReallifeGamemode.Server.Events
       {
         client.Armor = 50;
       }
-      
-      using(var context = new DatabaseContext())
+
+      using (var context = new DatabaseContext())
       {
         User user = client.GetUser();
         FactionWeapon slot1 = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == primaryModel).FirstOrDefault();

ReallifeGamemode.Server/Events/Vehicle.cs

@@ -202,7 +202,7 @@ namespace ReallifeGamemode.Server.Events
     [ServerEvent(Event.VehicleDeath)]
     public void VehicleDeathEvent(GTANetworkAPI.Vehicle veh)
     {
-      
+
     }
   }
 }

ReallifeGamemode.Server/Extensions/ClientExtension.cs

@@ -111,18 +111,18 @@ namespace ReallifeGamemode.Server.Extensions
       foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
       {
         User copUser = copPlayer.GetUser();
-        if(cop != null && (copUser.FactionId == 1 || copUser.FactionId == 3))
+        if (cop != null && (copUser.FactionId == 1 || copUser.FactionId == 3))
         {
-          ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Straftäter: "+ user.Name + ".");
+          ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel " + amount + ". Straftäter: " + user.Name + ".");
           ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Grund: " + reason + ".");
           ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Der Straftäter: " + user.Name + " wird nun mit Fahndungslevel " + newWanteds + " gesucht.");
         }
-        else if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop == null)
+        else if ((copUser.FactionId == 1 || copUser.FactionId == 3) && cop == null)
         {
           ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: " + user.Name + " hat eine Straftat begangen. Grund: " + reason + ".");
           ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Der Straftäter: " + user.Name + " wird nun mit Fahndungslevel " + newWanteds + " gesucht.");
         }
-      }      
+      }
     }
     public static FactionRank GetFactionRank(this User user)
     {

ReallifeGamemode.Server/Finance/Economy.cs

@@ -168,7 +168,7 @@ namespace ReallifeGamemode.Server.Finance
       Paychecks[user.Id] = paycheck;
       ReleasePayDay(client, paycheck);
     }
-    
+
     private static int GetRentalFees(Client client)
     {
       using (var dbContext = new DatabaseContext())

ReallifeGamemode.Server/Gangwar/Gangwar.cs

@@ -155,13 +155,13 @@ namespace ReallifeGamemode.Server.Gangwar
           return;
         }
       }
-      if(client.GetUser().Faction.Name == "Ballas" || client.GetUser().Faction.Name == "Grove")
+      if (client.GetUser().Faction.Name == "Ballas" || client.GetUser().Faction.Name == "Grove")
       {
         foreach (var turf in getTurfs())
         {
-          foreach(var u in turf.playerInside)
+          foreach (var u in turf.playerInside)
           {
-            if(u == client)
+            if (u == client)
             {
               if (turf.Owner != client.GetUser().Faction.Name)
                 turf.attack(client.GetUser().Faction.Name);

ReallifeGamemode.Server/Gangwar/Turf.cs

@@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Gangwar
 {
   public class Turf
   {
-    
+
     public int TurfID { get; set; }
     public string TurfName { get; set; }
     public int Color { get; set; }
@@ -68,7 +68,7 @@ namespace ReallifeGamemode.Server.Gangwar
     {
       return this.Attacker;
     }
-  
+
     private void TurfTick()
     {
       this.timer = new System.Timers.Timer(1000);
@@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.Gangwar
 
     private void Tick(object sender, System.Timers.ElapsedEventArgs e)
     {
-      if(this.status == "attack")
+      if (this.status == "attack")
       {
         update();
       }
@@ -120,16 +120,17 @@ namespace ReallifeGamemode.Server.Gangwar
       if (this.Def_Score <= 0)
       {
         this.takeOver(this.Attacker);
-      } else if (this.Att_Score <= 0)
+      }
+      else if (this.Att_Score <= 0)
       {
         this.takeOver(this.Owner);
       }
       timerCount += 1;
-      if(timerCount >= 60) //change to 900 before release
+      if (timerCount >= 60) //change to 900 before release
       {
         this.timer.Stop();
         this.timer = null;
-        if(this.Def_Score > this.Att_Score)
+        if (this.Def_Score > this.Att_Score)
         {
           this.takeOver(this.Owner);
           this.Att_Score = 0;
@@ -137,7 +138,8 @@ namespace ReallifeGamemode.Server.Gangwar
           {
             gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
           }
-        }else if(this.Def_Score < this.Att_Score)
+        }
+        else if (this.Def_Score < this.Att_Score)
         {
           this.takeOver(this.Attacker);
           this.Def_Score = 0;
@@ -147,7 +149,7 @@ namespace ReallifeGamemode.Server.Gangwar
           }
           return;
         }
-        else if(this.Def_Score == this.Att_Score)
+        else if (this.Def_Score == this.Att_Score)
         {
           this.takeOver(this.Attacker);
           this.Def_Score = 0;
@@ -177,8 +179,9 @@ namespace ReallifeGamemode.Server.Gangwar
           return;
         }
       }
-     
-      if(playerInside.Find(c => c == client) == null) {
+
+      if (playerInside.Find(c => c == client) == null)
+      {
         playerInside.Add(client);
         client.SetData("GotInsideOfTurf", true);
       }
@@ -186,10 +189,10 @@ namespace ReallifeGamemode.Server.Gangwar
 
     public void leave(Client client)
     {
-      if(playerInside.Find(c => c == client) != null)
+      if (playerInside.Find(c => c == client) != null)
       {
         this.playerInside = this.playerInside.Where(c => c != client).ToList();
-        if(this.status != "attack")
+        if (this.status != "attack")
           client.ResetData("GotInsideOfTurf");
       }
     }
@@ -213,7 +216,7 @@ namespace ReallifeGamemode.Server.Gangwar
             a.TriggerEvent("CLIENT:loose");
           }
           ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat erfolgreich das Gebiet  ~g~" + getName() + "~w~ verteidigt.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault());
-          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat den Angrif auf das Gebiet ~r~" + getName() + "~w~ verloren.", dbContext.Factions.Where(f => f.Name == getAttacker()).FirstOrDefault());         
+          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat den Angrif auf das Gebiet ~r~" + getName() + "~w~ verloren.", dbContext.Factions.Where(f => f.Name == getAttacker()).FirstOrDefault());
         }
         else if (getOwner() != FactionName)
         {
@@ -239,10 +242,10 @@ namespace ReallifeGamemode.Server.Gangwar
           turf.FactionId = dbContext.Factions.Where(f => f.Name == this.Owner).FirstOrDefault().Id;
           dbContext.SaveChanges();
         }
-        
+
       }
       this.Attacker = null;
-      foreach(var c in playerInGangwar)
+      foreach (var c in playerInGangwar)
       {
         c.TriggerEvent("CLIENT:setAttackBlip", false, TurfID);
         c.ResetData("inGangWar");
@@ -255,9 +258,9 @@ namespace ReallifeGamemode.Server.Gangwar
 
     public void attack(string attacker)
     {
-      if(this.status == "normal")
+      if (this.status == "normal")
       {
-        if(this.timer != null)
+        if (this.timer != null)
         {
           this.timer.Stop();
           this.timer = null;
@@ -274,7 +277,7 @@ namespace ReallifeGamemode.Server.Gangwar
             u.TriggerEvent("CLIENT:setAttackBlip", true, TurfID);
             u.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score);
             u.SetData("inGangWar", getId());
-            ChatService.SendMessage(u, "~y~[GANGWAR]~w~ Die " + getAttacker() + " hat das Gebiet ~y~"+ TurfName +"~w~ der "+ getOwner() +" angegriffen.");
+            ChatService.SendMessage(u, "~y~[GANGWAR]~w~ Die " + getAttacker() + " hat das Gebiet ~y~" + TurfName + "~w~ der " + getOwner() + " angegriffen.");
             clientsInGangwar.Add(u);
           }
           playerInGangwar = clientsInGangwar.ToArray();

ReallifeGamemode.Server/Job/BusDriverJob.cs

@@ -41,11 +41,11 @@ namespace ReallifeGamemode.Server.Job
       new Vector3(313.7626,-647.1252,27.6658),
       new Vector3(28.84793,-543.386,34.42649),
       new Vector3(120.2759,-195.0664,52.98029),
-      new Vector3(291.5339,-257.244,52.89333),      
+      new Vector3(291.5339,-257.244,52.89333),
       new Vector3(459.6921,116.3203,97.18157),
       new Vector3(173.9451,220.1987,104.4178),
       new Vector3(-327.3175,261.2248,84.86708),
-      new Vector3(-764.2745,294.4415,84.00808),      
+      new Vector3(-764.2745,294.4415,84.00808),
       new Vector3(-980.486,275.0842,67.26749),
       new Vector3(-1031.586,107.9002,51.30307),
       new Vector3(-489.973,-195.4356,35.59651),
@@ -108,7 +108,7 @@ namespace ReallifeGamemode.Server.Job
       if (veh.DisplayName == "Bus")
       {
         listRouteTexts2.Add("Kurz 1");
-        listRouteTexts2.Add("Kurz 2");;
+        listRouteTexts2.Add("Kurz 2"); ;
 
         player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts2));
       }

ReallifeGamemode.Server/Job/PilotJob.cs

@@ -45,7 +45,7 @@ namespace ReallifeGamemode.Server.Job
         new Vector3(-1275.95, 342.97, 326.71),
       }.AsReadOnly();
 
-          private readonly IReadOnlyCollection<Vector3> Route3 = new List<Vector3>
+    private readonly IReadOnlyCollection<Vector3> Route3 = new List<Vector3>
       {
         new Vector3(-850.61, 2181.98, 429.67),
         new Vector3(-675.89, 1709.52, 462.85),
@@ -54,10 +54,10 @@ namespace ReallifeGamemode.Server.Job
         new Vector3(-2607.08, 2981.38, 454.81),
         new Vector3(-1771.7, 4241.02, 460.07),
         new Vector3(1158.77, 4573.67, 455.08),
-        new Vector3(2028.63, 4842.29, 437.01),  
+        new Vector3(2028.63, 4842.29, 437.01),
       }.AsReadOnly();
 
-          private readonly IReadOnlyCollection<Vector3> Route4 = new List<Vector3>
+    private readonly IReadOnlyCollection<Vector3> Route4 = new List<Vector3>
       {
         new Vector3(893.99, -3091.43, 326.67),
         new Vector3(1712.6, -1676.47, 384.2),
@@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Job
         new Vector3(-2333.96, 510.26, 660.64),
       }.AsReadOnly();
 
-       private readonly IReadOnlyCollection<Vector3> Route5 = new List<Vector3>
+    private readonly IReadOnlyCollection<Vector3> Route5 = new List<Vector3>
     {
       new Vector3(-485.68, -2776.08, 204.5),
       new Vector3(-19.83, -2133.08, 296.04),
@@ -113,26 +113,26 @@ namespace ReallifeGamemode.Server.Job
       List<String> listRouteTexts = new List<string>();
       List<String> listRouteTexts2 = new List<string>();
 
-        Vehicle veh = player.Vehicle;
+      Vehicle veh = player.Vehicle;
 
-        if (veh.DisplayName == "Velum")
-        {
+      if (veh.DisplayName == "Velum")
+      {
 
-          listRouteTexts2.Add("Route 4");
-          listRouteTexts2.Add("Route 5");
-          listRouteTexts2.Add("Route 6");
+        listRouteTexts2.Add("Route 4");
+        listRouteTexts2.Add("Route 5");
+        listRouteTexts2.Add("Route 6");
 
         player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts2));
-        }
-        else
-        {
-          listRouteTexts.Add("Route 1");
-          listRouteTexts.Add("Route 2");
-          listRouteTexts.Add("Route 3");
+      }
+      else
+      {
+        listRouteTexts.Add("Route 1");
+        listRouteTexts.Add("Route 2");
+        listRouteTexts.Add("Route 3");
+
+        player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts));
+      }
 
-          player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts));
-        }
-      
     }
     [RemoteEvent("startPilotRoute")]
     public void StartPilotRoute(Client player, string type)
@@ -159,7 +159,7 @@ namespace ReallifeGamemode.Server.Job
       }
       else if (type == "Route 6")
       {
-        CheckPointHandle.StartCheckPointRoute(player, Route6, 0, 6,12, "");
+        CheckPointHandle.StartCheckPointRoute(player, Route6, 0, 6, 12, "");
       }
     }
   }

ReallifeGamemode.Server/Managers/BusinessManager.cs

@@ -267,7 +267,7 @@ namespace ReallifeGamemode.Server.Managers
       {
         User user = player.GetUser(dbContext);
 
-        if(user.Id != business.Id)
+        if (user.Id != business.Id)
         {
           ChatService.ErrorMessage(player, "Dieses Business gehört nicht dir");
           return;

ReallifeGamemode.Server/Managers/InteractionManager.cs

@@ -144,21 +144,21 @@ namespace ReallifeGamemode.Server.Managers
           player.SendNotification("~r~Sie besitzen keine Scheine!");
           return;
         }
-        if (player.Position.DistanceTo(target.Position) > 5)        
+        if (player.Position.DistanceTo(target.Position) > 5)
           return;
 
         if (target.HasData("ShowActive"))
         {
           player.SendNotification("Spieler ist beschäftigt.");
           return;
-        }       
+        }
         target.SetData("ShowActive", true);
         List<bool> licenses = new List<bool>();
         licenses.Add(playerUser.DriverLicenseVehicle);
         licenses.Add(playerUser.DriverLicenseBike);
         licenses.Add(playerUser.FlyingLicensePlane);
         target.TriggerEvent("ShowLicenses", player.Name, licenses.ToArray());
-          
+
       }
     }
 
@@ -267,7 +267,7 @@ namespace ReallifeGamemode.Server.Managers
           target.GetUser(dbContext).FactionId = null;
 
           ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
-          ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");        
+          ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
           target.SetSharedData("blipColor", 0);
           dbContext.SaveChanges();
         }

ReallifeGamemode.Server/Managers/InventoryManager.cs

@@ -138,7 +138,7 @@ namespace ReallifeGamemode.Server.Managers
     }
 
 
-     public static int GetVehicleInventoryWeight(Vehicle veh)
+    public static int GetVehicleInventoryWeight(Vehicle veh)
     {
       var inventoryWeight = 0;
 
@@ -229,19 +229,20 @@ namespace ReallifeGamemode.Server.Managers
                 {
                   IItem iItem = GetItemById(vItem.ItemId);
 
-                  if (GetUserInventoryWeight(client) +  (iItem.Gewicht * vItem.Amount) > 40000)
+                  if (GetUserInventoryWeight(client) + (iItem.Gewicht * vItem.Amount) > 40000)
                   {
-                    for(int i = 0; i <= vItem.Amount; i++)
+                    for (int i = 0; i <= vItem.Amount; i++)
                     {
-                      if(GetUserInventoryWeight(client) + (iItem.Gewicht * i) > 40000) {
+                      if (GetUserInventoryWeight(client) + (iItem.Gewicht * i) > 40000)
+                      {
                         vItem.Amount = i - 1;
                         break;
                       }
-                     
+
                     }
                   }
 
-                  if(vItem.Amount == 0)
+                  if (vItem.Amount == 0)
                   {
                     return false;
                   }
@@ -282,7 +283,7 @@ namespace ReallifeGamemode.Server.Managers
         }
         else if (origin[0] == 0)
         {
-          
+
           VehicleItem cItem = new VehicleItem
           {
             Amount = vehAmount,
@@ -290,7 +291,7 @@ namespace ReallifeGamemode.Server.Managers
             VehicleId = origin[1],
             Slot = -1,
           };
-          
+
           UserItem uItem = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == cItem.ItemId).FirstOrDefault();
           IItem iItem = GetItemById(cItem.ItemId);
           Vehicle veh = VehicleManager.GetVehicleFromId(cItem.VehicleId);
@@ -303,7 +304,7 @@ namespace ReallifeGamemode.Server.Managers
                 cItem.Amount = i - 1;
                 break;
               }
-             
+
             }
           }
 
@@ -399,7 +400,7 @@ namespace ReallifeGamemode.Server.Managers
 
 
     [RemoteEvent("saveInventory")]
-    public void SavePlayerInventory(Client player, string jsonItemID,string jsonItemAmount, string jsonGotFrom, string vehAmount)
+    public void SavePlayerInventory(Client player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
     {
 
       var user = player.GetUser();
@@ -407,34 +408,34 @@ namespace ReallifeGamemode.Server.Managers
       var itemAmount = JsonConvert.DeserializeObject<int>(jsonItemAmount);
       var origin = JsonConvert.DeserializeObject<int[]>(jsonGotFrom);
 
-      if (!CheckOriginOfItem(player,jsonItemID, jsonItemAmount,jsonGotFrom, vehAmount))
+      if (!CheckOriginOfItem(player, jsonItemID, jsonItemAmount, jsonGotFrom, vehAmount))
         return;
 
       using (var context = new DatabaseContext())
       {
 
-          UserItem cItem = new UserItem
-          {
-            Amount = itemAmount,
-            ItemId = itemID,
-            UserId = user.Id,
-            Slot = -1,
-          };
+        UserItem cItem = new UserItem
+        {
+          Amount = itemAmount,
+          ItemId = itemID,
+          UserId = user.Id,
+          Slot = -1,
+        };
+
 
-       
         UserItem item = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == cItem.ItemId).FirstOrDefault();
-          if (item == null)
-          {
-            context.UserItems.Add(cItem);
-          }
-          else if (cItem.Amount <= 0)
-          {           
-            context.UserItems.Remove(item);
-          }
-          else
-          {
-            item.Amount = cItem.Amount;
-          }
+        if (item == null)
+        {
+          context.UserItems.Add(cItem);
+        }
+        else if (cItem.Amount <= 0)
+        {
+          context.UserItems.Remove(item);
+        }
+        else
+        {
+          item.Amount = cItem.Amount;
+        }
 
         context.SaveChanges();
         IItem iItem = GetItemById(item.ItemId);
@@ -511,7 +512,7 @@ namespace ReallifeGamemode.Server.Managers
 
     public static void RemoveAllItemsfromVehicleInventory(Vehicle veh)
     {
-      using(var context = new DatabaseContext())
+      using (var context = new DatabaseContext())
       {
         ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(veh);
         List<VehicleItem> allItemsByVehicle = context.VehicleItems.ToList().FindAll(i => i.VehicleId == sVeh.Id);
@@ -614,14 +615,15 @@ namespace ReallifeGamemode.Server.Managers
               {
                 dropPosition.Z -= 0.8f;
                 grndObject = NAPI.Object.CreateObject(3777723516, dropPosition, new Vector3(0, 0, r.Next(0, 360)), 0);
-              }             
+              }
               GroundItem grndItem = new GroundItem { ItemId = iItem.Id, Amount = amount, Position = dropPosition };
               TextLabel grndTxtLbl = NAPI.TextLabel.CreateTextLabel(iItem.Name + " ~s~(~y~" + amount + "~s~)", dropPosition, 5, 0.5f, 4, new Color(255, 255, 255), false, 0);
               GroundItem.AddGroundItem(grndItem, grndObject, grndTxtLbl);
-              if(fItem.Amount > amount)
+              if (fItem.Amount > amount)
               {
                 fItem.Amount -= amount;
-              }else if(fItem.Amount == amount)
+              }
+              else if (fItem.Amount == amount)
               {
                 context.UserItems.Remove(fItem);
               }
@@ -654,7 +656,7 @@ namespace ReallifeGamemode.Server.Managers
       int[] itemIdArr = JsonConvert.DeserializeObject<int[]>(itemIdArrStr);
       int[] itemAmountArr = JsonConvert.DeserializeObject<int[]>(itemAmountArrStr);
       List<string> itemNameList = new List<string>();
-      
+
 
       if (target.HasData("inTrade") && target.GetData("inTrade") == true)
       {
@@ -665,7 +667,7 @@ namespace ReallifeGamemode.Server.Managers
       using (var context = new DatabaseContext())
       {
         int targetInvWeight = GetUserInventoryWeight(target);
-        
+
         for (int i = 0; i < itemIdArr.Length; i++)
         {
           int itemId = itemIdArr[i];
@@ -813,7 +815,7 @@ namespace ReallifeGamemode.Server.Managers
         return;
       }
       target.SetData("inTrade", false);
-   
+
       using (var context = new DatabaseContext())
       {
 

ReallifeGamemode.Server/Managers/PositionManager.cs

@@ -52,13 +52,13 @@ namespace ReallifeGamemode.Server.Managers
       #region WeaponPoints
       WeaponPoint weaponPointLSPD = new WeaponPoint()
       {
-        Position = new Vector3(460.3162,-981.0168,30.68959),
+        Position = new Vector3(460.3162, -981.0168, 30.68959),
         FactionId = 1
       };
       WeaponPoint weaponPointFIB = new WeaponPoint()
       {
         //Position = new Vector3(119.6835, -729.3273, 242.1519), old
-        Position = new Vector3(143.5561,-762.7424,242.152),
+        Position = new Vector3(143.5561, -762.7424, 242.152),
         FactionId = 3
       };
       WeaponPoint weaponPointBallas = new WeaponPoint()
@@ -91,7 +91,7 @@ namespace ReallifeGamemode.Server.Managers
       };
       JailReleasePoint jailPointFIB = new JailReleasePoint()
       {
-        Position = new Vector3(119.6362,-727.6199,242.152)
+        Position = new Vector3(119.6362, -727.6199, 242.152)
       };
 
       JailReleasePoints.Add(jailPointLSPD);
@@ -110,20 +110,20 @@ namespace ReallifeGamemode.Server.Managers
         Position = new Vector3(136.1958, -761.657, 242.152), //FBI oben
         FactionId = 3,
         Stage = "Büro"
-    };
+      };
       ElevatorPoint FibElevatorPointIntern = new ElevatorPoint()
       {
         Position = new Vector3(136.1958, -761.7176, 45.75203), //FBI unten
         FactionId = 3,
         Stage = "EG"
-    };
+      };
       ElevatorPoint FibElevatorPointGarage = new ElevatorPoint()
       {
         Position = new Vector3(124.2521, -741.3329, 33.13322), //FBI ganz ganz unten
         FactionId = 3,
         Stage = "Garage"
       };
-   
+
       ElevatorPoints.Add(FibElevatorPointEG);
       ElevatorPoints.Add(FibElevatorPointIntern);
       ElevatorPoints.Add(FibElevatorPointGarage);

ReallifeGamemode.Server/Migrations/20190719210722_PaydayTimer.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class PaydayTimer : Migration
+  public partial class PaydayTimer : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "PaydayTimer",
-                table: "Users",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "PaydayTimer",
-                table: "Users");
-        }
+      migrationBuilder.AddColumn<int>(
+          name: "PaydayTimer",
+          table: "Users",
+          nullable: false,
+          defaultValue: 0);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "PaydayTimer",
+          table: "Users");
+    }
+  }
 }

ReallifeGamemode.Server/Migrations/20190721144830_FactionWeapons.cs

@@ -3,42 +3,42 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class FactionWeapons : Migration
+  public partial class FactionWeapons : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "FactionWeapons",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    FactionId = table.Column<int>(nullable: false),
-                    WeaponModel = table.Column<string>(nullable: true),
-                    SlotID = table.Column<int>(nullable: false),
-                    Rank = table.Column<int>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_FactionWeapons", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_FactionWeapons_Factions_FactionId",
-                        column: x => x.FactionId,
-                        principalTable: "Factions",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
+      migrationBuilder.CreateTable(
+          name: "FactionWeapons",
+          columns: table => new
+          {
+            Id = table.Column<int>(nullable: false)
+                  .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+            FactionId = table.Column<int>(nullable: false),
+            WeaponModel = table.Column<string>(nullable: true),
+            SlotID = table.Column<int>(nullable: false),
+            Rank = table.Column<int>(nullable: false)
+          },
+          constraints: table =>
+          {
+            table.PrimaryKey("PK_FactionWeapons", x => x.Id);
+            table.ForeignKey(
+                      name: "FK_FactionWeapons_Factions_FactionId",
+                      column: x => x.FactionId,
+                      principalTable: "Factions",
+                      principalColumn: "Id",
+                      onDelete: ReferentialAction.Cascade);
+          });
 
-            migrationBuilder.CreateIndex(
-                name: "IX_FactionWeapons_FactionId",
-                table: "FactionWeapons",
-                column: "FactionId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "FactionWeapons");
-        }
+      migrationBuilder.CreateIndex(
+          name: "IX_FactionWeapons_FactionId",
+          table: "FactionWeapons",
+          column: "FactionId");
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropTable(
+          name: "FactionWeapons");
+    }
+  }
 }

ReallifeGamemode.Server/Migrations/20190722201850_VehicleLivery.cs

@@ -2,22 +2,22 @@
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class VehicleLivery : Migration
+  public partial class VehicleLivery : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "Livery",
-                table: "ServerVehicles",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Livery",
-                table: "ServerVehicles");
-        }
+      migrationBuilder.AddColumn<int>(
+          name: "Livery",
+          table: "ServerVehicles",
+          nullable: false,
+          defaultValue: 0);
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropColumn(
+          name: "Livery",
+          table: "ServerVehicles");
+    }
+  }
 }

ReallifeGamemode.Server/Migrations/20190728142431_HouseEnhancments.cs

@@ -3,71 +3,71 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class HouseEnhancments : Migration
+  public partial class HouseEnhancments : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "CanRentIn",
-                table: "Houses",
-                nullable: false,
-                defaultValue: false);
+      migrationBuilder.AddColumn<bool>(
+          name: "CanRentIn",
+          table: "Houses",
+          nullable: false,
+          defaultValue: false);
 
-            migrationBuilder.AddColumn<int>(
-                name: "RentalFee",
-                table: "Houses",
-                nullable: false,
-                defaultValue: 0);
+      migrationBuilder.AddColumn<int>(
+          name: "RentalFee",
+          table: "Houses",
+          nullable: false,
+          defaultValue: 0);
 
-            migrationBuilder.CreateTable(
-                name: "HouseRentals",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    HouseId = table.Column<int>(nullable: true),
-                    UserId = table.Column<int>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_HouseRentals", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_HouseRentals_Houses_HouseId",
-                        column: x => x.HouseId,
-                        principalTable: "Houses",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_HouseRentals_Users_UserId",
-                        column: x => x.UserId,
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                });
+      migrationBuilder.CreateTable(
+          name: "HouseRentals",
+          columns: table => new
+          {
+            Id = table.Column<int>(nullable: false)
+                  .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+            HouseId = table.Column<int>(nullable: true),
+            UserId = table.Column<int>(nullable: true)
+          },
+          constraints: table =>
+          {
+            table.PrimaryKey("PK_HouseRentals", x => x.Id);
+            table.ForeignKey(
+                      name: "FK_HouseRentals_Houses_HouseId",
+                      column: x => x.HouseId,
+                      principalTable: "Houses",
+                      principalColumn: "Id",
+                      onDelete: ReferentialAction.Restrict);
+            table.ForeignKey(
+                      name: "FK_HouseRentals_Users_UserId",
+                      column: x => x.UserId,
+                      principalTable: "Users",
+                      principalColumn: "Id",
+                      onDelete: ReferentialAction.Restrict);
+          });
 
-            migrationBuilder.CreateIndex(
-                name: "IX_HouseRentals_HouseId",
-                table: "HouseRentals",
-                column: "HouseId");
+      migrationBuilder.CreateIndex(
+          name: "IX_HouseRentals_HouseId",
+          table: "HouseRentals",
+          column: "HouseId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_HouseRentals_UserId",
-                table: "HouseRentals",
-                column: "UserId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "HouseRentals");
-
-            migrationBuilder.DropColumn(
-                name: "CanRentIn",
-                table: "Houses");
-
-            migrationBuilder.DropColumn(
-                name: "RentalFee",
-                table: "Houses");
-        }
+      migrationBuilder.CreateIndex(
+          name: "IX_HouseRentals_UserId",
+          table: "HouseRentals",
+          column: "UserId");
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropTable(
+          name: "HouseRentals");
+
+      migrationBuilder.DropColumn(
+          name: "CanRentIn",
+          table: "Houses");
+
+      migrationBuilder.DropColumn(
+          name: "RentalFee",
+          table: "Houses");
+    }
+  }
 }

ReallifeGamemode.Server/Migrations/20190805184145_VehicleItems.cs

@@ -3,48 +3,48 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class VehicleItems : Migration
+  public partial class VehicleItems : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-          
-            migrationBuilder.CreateTable(
-                name: "VehicleItems",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    ItemId = table.Column<int>(nullable: false),
-                    VehicleId = table.Column<int>(nullable: false),
-                    Amount = table.Column<int>(nullable: false),
-                    Slot = table.Column<int>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_VehicleItems", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_VehicleItems_ServerVehicles_VehicleId",
-                        column: x => x.VehicleId,
-                        principalTable: "ServerVehicles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
 
-            migrationBuilder.CreateIndex(
-                name: "IX_VehicleItems_VehicleId",
-                table: "VehicleItems",
-                column: "VehicleId");
+      migrationBuilder.CreateTable(
+          name: "VehicleItems",
+          columns: table => new
+          {
+            Id = table.Column<int>(nullable: false)
+                  .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+            ItemId = table.Column<int>(nullable: false),
+            VehicleId = table.Column<int>(nullable: false),
+            Amount = table.Column<int>(nullable: false),
+            Slot = table.Column<int>(nullable: false)
+          },
+          constraints: table =>
+          {
+            table.PrimaryKey("PK_VehicleItems", x => x.Id);
+            table.ForeignKey(
+                      name: "FK_VehicleItems_ServerVehicles_VehicleId",
+                      column: x => x.VehicleId,
+                      principalTable: "ServerVehicles",
+                      principalColumn: "Id",
+                      onDelete: ReferentialAction.Cascade);
+          });
 
-           
-        }
+      migrationBuilder.CreateIndex(
+          name: "IX_VehicleItems_VehicleId",
+          table: "VehicleItems",
+          column: "VehicleId");
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
 
-            migrationBuilder.DropTable(
-                name: "VehicleItems");
-
-         
-        }
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+
+      migrationBuilder.DropTable(
+          name: "VehicleItems");
+
+
+    }
+  }
 }

ReallifeGamemode.Server/Migrations/20190911192912_BusinessData.cs

@@ -3,29 +3,29 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ReallifeGamemode.Database.Migrations
 {
-    public partial class BusinessData : Migration
+  public partial class BusinessData : Migration
+  {
+    protected override void Up(MigrationBuilder migrationBuilder)
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "BusinessData",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    BusinessId = table.Column<int>(nullable: false),
-                    Price = table.Column<int>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BusinessData", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "BusinessData");
-        }
+      migrationBuilder.CreateTable(
+          name: "BusinessData",
+          columns: table => new
+          {
+            Id = table.Column<int>(nullable: false)
+                  .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+            BusinessId = table.Column<int>(nullable: false),
+            Price = table.Column<int>(nullable: false)
+          },
+          constraints: table =>
+          {
+            table.PrimaryKey("PK_BusinessData", x => x.Id);
+          });
     }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropTable(
+          name: "BusinessData");
+    }
+  }
 }

ReallifeGamemode.Server/Report/ReportManage.cs

@@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Report
     private String reportText;
     private Boolean assigned;
 
-    public ReportManage (String nUser, string nReportText)
+    public ReportManage(String nUser, string nReportText)
     {
       this.user = nUser;
       this.admin = "N/A";

ReallifeGamemode.Server/Util/CheckPointHandle.cs

@@ -21,7 +21,7 @@ namespace ReallifeGamemode.Server.Util
       playerHandle.DeleteCheckpoints();
 
       listHandle.Add(playerHandle);
-      
+
       playerHandle.StartRoute();
     }
     public static void RemovePlayerHandlerFromList(Client player)
@@ -48,7 +48,7 @@ namespace ReallifeGamemode.Server.Util
         {
           break;
         }
-      }      
+      }
       temp.NextCheckpoint();
     }
   }
@@ -88,7 +88,7 @@ namespace ReallifeGamemode.Server.Util
         this.player.TriggerEvent("setCheckPoint", nextCp, player, this.checkPointsDone, delay, this.markerID, this.markerSize, this.eventInCheckpoint);
       }
       if (this.list.Count() == checkPointsDone)
-      {       
+      {
         CheckPointHandle.RemovePlayerHandlerFromList(this.player);
 
         if (this.eventInCheckpoint == "busDriverJob")

ReallifeGamemode.Server/Wanted/Autowanted.cs

@@ -15,18 +15,18 @@ namespace ReallifeGamemode.Server.Wanted
       User killer = killerPlayer.GetUser();
       if (killer.FactionId == 1 || killer.FactionId == 3)
         return;
-      
-        User cop = copPlayer.GetUser();
-        if(cop.FactionId == 1 || cop.FactionId == 3)
+
+      User cop = copPlayer.GetUser();
+      if (cop.FactionId == 1 || cop.FactionId == 3)
+      {
+        using (var dbContext = new DatabaseContext())
         {
-          using (var dbContext = new DatabaseContext())
-          {
-            killer = killerPlayer.GetUser(dbContext);
-            killer.GiveWanteds(copPlayer, 10, "Beamten-Mord");
-            dbContext.SaveChanges();
-          }
+          killer = killerPlayer.GetUser(dbContext);
+          killer.GiveWanteds(copPlayer, 10, "Beamten-Mord");
+          dbContext.SaveChanges();
         }
-      
+      }
+
     }
   }
 }

ReallifeGamemode.Server/Wanted/Jail.cs

@@ -106,12 +106,12 @@ namespace ReallifeGamemode.Server.Wanted
                 break;
 
             }
-          }          
+          }
         }
       }
     }
 
-    
+
 
     public static void JailTimer()
     {
@@ -203,7 +203,8 @@ namespace ReallifeGamemode.Server.Wanted
             if (((int)(user.JailTime / 60)) == 0 && user.JailTime != 0)
             {
               timeMinutes = 1;
-            } else
+            }
+            else
             {
               timeMinutes = (int)(user.JailTime / 60);
             }
@@ -241,7 +242,7 @@ namespace ReallifeGamemode.Server.Wanted
         player.TriggerEvent("jailTime", 0);
       }
     }
-    
+
     public static void Release_Jail_Admin(Client admin, Client target)
     {
       User user = target.GetUser();

ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs

@@ -70,7 +70,7 @@ namespace ReallifeGamemode.Server.Wanted
             using (var dbContext = new DatabaseContext())
             {
               player.GetUser(dbContext).Wanteds -= 1;
-              if(player.GetUser(dbContext).Wanteds == 0)
+              if (player.GetUser(dbContext).Wanteds == 0)
               {
                 switch (player.GetUser(dbContext).FactionId)
                 {

ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs

@@ -12,7 +12,7 @@ using ReallifeGamemode.Server.Util;
 
 namespace ReallifeGamemode.Server.WeaponDeal
 {
-  public class WeaponDealManager:Script
+  public class WeaponDealManager : Script
   {
     public static bool checkWeaponDbyVehicle(Vehicle vehicle)
     {
@@ -62,17 +62,17 @@ namespace ReallifeGamemode.Server.WeaponDeal
 
     private static void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
     {
-      using(var context = new DatabaseContext())
+      using (var context = new DatabaseContext())
       {
         List<Faction> fac = context.Factions.ToList<Faction>();
-        foreach(var faction in fac)
+        foreach (var faction in fac)
         {
           if (faction.WeaponDealTime > 0)
-            faction.WeaponDealTime -= 1;           
+            faction.WeaponDealTime -= 1;
         }
         context.SaveChanges();
       }
-      
+
     }
 
 
@@ -91,7 +91,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
         fVeh.SetData("WeaponDealLoad", true);
         InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
         Random rnd = new Random();
-        if(factionVehicle.FactionId == 8 || factionVehicle.FactionId == 7)
+        if (factionVehicle.FactionId == 8 || factionVehicle.FactionId == 7)
         {
           VehicleItem item = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = rnd.Next(45, 75) }; //pistole
           InventoryManager.AddItemToVehicleInventory(client, item, fVeh);

ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs

@@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
       if (!factionWeaponDeal.ContainsKey(factionID))
         return null;
 
-      if(factionWeaponDeal[factionID] == -1)
+      if (factionWeaponDeal[factionID] == -1)
       {
         Random rnd = new Random();
         factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1);