Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

ReallifeGamemode.Server/Events/Key.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using GTANetworkAPI;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using ReallifeGamemode.Database.Entities;
 using ReallifeGamemode.Database.Models;
@@ -19,6 +20,7 @@ using ReallifeGamemode.Server.Services;
 using ReallifeGamemode.Server.Types;
 using ReallifeGamemode.Server.Util;
 using ReallifeGamemode.Server.WeaponDeal;
+using ReallifeGamemode.Server.Log;
 
 /**
 * @overview Life of German Reallife - Event Key (Key.cs)
@@ -30,6 +32,8 @@ namespace ReallifeGamemode.Server.Events
 {
   public class Key : Script
   {
+    private static readonly ILogger logger = LogManager.GetLogger<Key>();
+
     #region User Key
 
     [RemoteEvent("keyPress:NUM2")]
@@ -171,7 +175,7 @@ namespace ReallifeGamemode.Server.Events
         isActive = JobBase.GetPlayerInJob().Contains(player),
       };
 
-      var memberList = dbContext.Users.Where(f => f.FactionId == u.FactionId && u.FactionId != 0).OrderByDescending(f => f.FactionRank.Order).ThenBy(f => f.Name).Select(m => new
+      var memberList = dbContext.Users.Where(f => f.FactionId == u.FactionId && u.FactionId != null && u.FactionId != 0).OrderByDescending(f => f.FactionRank.Order).ThenBy(f => f.Name).Select(m => new
       {
         username = m.Name,
         factionRank = m.FactionRank.Order,
@@ -293,6 +297,8 @@ namespace ReallifeGamemode.Server.Events
               dbContext.VehicleItems.Remove(v);
             }
 
+            logger.LogInformation("Player {0} took the weapon deal item {1} (amount: {2}) out of weapon vehicle {3}", player.Name, v.VehicleId, itemToAdd, v.VehicleId);
+
             InventoryManager.AddItemToInventory(player, v.ItemId, itemToAdd);
             nearestBehindVehiclePoint.usePoint(player);
             dbContext.SaveChanges();
@@ -392,6 +398,8 @@ namespace ReallifeGamemode.Server.Events
                   continue;
                 }
 
+                logger.LogInformation("Player {0} put the weapon deal item \"{1}\" (amount: {2}) in weapon rack of faction {3}", player.Name, weapon.WeaponModel, item.Amount, user.FactionId);
+
                 weapon.Ammount += item.Amount;
                 ChatService.SendMessage(player, $"~y~[WT] ~s~Du hast eine ~y~Kiste abgeladen ~s~(Inhalt: {item.Amount}x {iItem.Name}).");
                 unloadedWeaponPackage = true;
@@ -585,6 +593,43 @@ namespace ReallifeGamemode.Server.Events
         }
       }
 
+      if (player.Position.DistanceTo(FarmerJob.POSITION_SCHEUNE) <= 1.5)
+      {
+        if (JobManager.GetJob<FarmerJob>().GetUsersInJob().Contains(player))
+        {
+          player.TriggerEvent("SERVER:selectField");
+          return;
+        }
+      }
+
+      if (player.Position.DistanceTo(FarmerJob.POSITION_FAHRZEUGHALLE) <= 1.5)
+      {
+        if (FarmerJob.playersWaitingForVehicle.Contains(player) || true)
+        {
+          FarmerJob.spawnVehicle(player);
+          return;
+        }
+      }
+
+      if (CharacterCreator.surgeryPoint.DistanceTo(player.Position) <= 1.5)
+      {
+        if (user.GetData<bool>("duty"))
+        {
+          player.SendNotification("~r~Im Dienst kannst du nicht operiert werden", false);
+          return;
+        }
+        if (JobBase.GetPlayerInJob().Contains(player))
+        {
+          player.SendNotification("~r~Im aktiven Job kannst du nicht operiert werden", false);
+          return;
+        }
+        if (user.Wanteds > 0)
+        {
+          player.SendNotification("~r~Wenn du gesucht wirst kannst du nicht operiert werden", false);
+          return;
+        }
+      }
+
       //if (CharacterCreator.surgeryPoint.DistanceTo(player.Position) <= 1.5)
       //{
       //  if (user.GetData<bool>("duty"))
@@ -963,7 +1008,7 @@ namespace ReallifeGamemode.Server.Events
     }
 
     [RemoteEvent("keyPress:Z")]
-    public void KeyPressX(Player player)
+    public void KeyPressZ(Player player)
     {
       if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
 

ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs

@@ -6,11 +6,15 @@ using ReallifeGamemode.Database.Entities;
 using ReallifeGamemode.Database.Models;
 using ReallifeGamemode.Server.Extensions;
 using System;
+using Microsoft.Extensions.Logging;
+using ReallifeGamemode.Server.Log;
 
 namespace ReallifeGamemode.Server.Events
 {
   public class UpdateCharacterCloth : Script
   {
+    private static readonly ILogger logger = LogManager.GetLogger<UpdateCharacterCloth>();
+
     [RemoteEvent("updateDutyProp")]
     public void UpdateDutyProp(Player player, int componentId, int componentVariation)
     {
@@ -280,7 +284,8 @@ namespace ReallifeGamemode.Server.Events
             }
           }
 
-          if(data[0] == 2){
+          if (data[0] == 2)
+          {
             User payer = client.GetUser(dbContext);
             payer.GetCharacter(dbContext);
             payer.Character.Hair = Convert.ToByte(data[2]);
@@ -288,13 +293,14 @@ namespace ReallifeGamemode.Server.Events
           }
 
           client.GetUser(dbContext).Handmoney -= data[6];
+          logger.LogInformation("Player {0} bought clothing for {1} dollars: slot = {2}, cloth = {3}, texture = {4}", client.Name, data[6], data[0], data[2], data[1]);
           dbContext.SaveChanges();
           //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
         }
         client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]);
       }
     }
-   
+
 
     [RemoteEvent("SERVER:BuyHairColor")]
     public void BuyHairColor(Player client, byte HairColor)
@@ -332,7 +338,7 @@ namespace ReallifeGamemode.Server.Events
         User payer = client.GetUser(dbContext);
         payer.GetCharacter(dbContext);
         payer.Handmoney -= 50;
-        payer.Character.HairHighlightColor = HairlightColor; 
+        payer.Character.HairHighlightColor = HairlightColor;
         // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
         dbContext.SaveChanges();
       }

ReallifeGamemode.Server/Events/Vehicle.cs

@@ -140,14 +140,9 @@ namespace ReallifeGamemode.Server.Events
         {
           ServerVehicle carlocked = v.GetServerVehicle(dbContext);
 
-          if (state == true)
+          if (carlocked != null)
           {
-            carlocked.Locked = true;
-            dbContext.SaveChanges();
-          }
-          else
-          {
-            carlocked.Locked = false;
+            carlocked.Locked = state;
             dbContext.SaveChanges();
           }
         }
@@ -208,14 +203,9 @@ namespace ReallifeGamemode.Server.Events
         {
           ServerVehicle carlocked = vehicle.GetServerVehicle(dbContext);
 
-          if (state == true)
+          if (carlocked != null)
           {
-            carlocked.Locked = true;
-            dbContext.SaveChanges();
-          }
-          else
-          {
-            carlocked.Locked = false;
+            carlocked.Locked = state;
             dbContext.SaveChanges();
           }
         }

ReallifeGamemode.Server/Events/Weapon.cs

@@ -130,7 +130,7 @@ namespace ReallifeGamemode.Server.Events
           player.SendNotification("Du hast nicht genügend Geld bei dir");
           return;
         }
-        logger.LogInformation("Player {0} bought a {1} in ammunation", user.Name, weaponmodel);
+        logger.LogInformation("Player {0} bought a weapon {1} in ammunation for {2} dollars", user.Name, weaponmodel, price);
         user.Handmoney -= price;
         dbContext.SaveChanges();
         player.GiveWeapon(NAPI.Util.WeaponNameToModel(weaponmodel), ammo);