diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 8230c661..3ee952f5 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -2243,7 +2243,8 @@ namespace ReallifeGamemode.Server.Commands { UserItem userItem = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount }; InventoryManager.AddItemToInventory(target, userItem.ItemId, userItem.Amount); - ChatService.SendMessage(player, $"~b~[ADMIN]~s~ Du hast ~y~{target.Name}~y~ ~y~{amount}~s~ mal das Item ~y~{item.Name}~s~ gegeben."); + ChatService.SendMessage(player, $"~b~[ADMIN]~s~ Du hast {target.Name} ~y~{amount}~s~x ~y~{item.Name}~s~ gegeben."); + ChatService.SendMessage(target, $"~b~[ADMIN]~s~ {player.Name} hat dir ~y~{amount}~s~x ~y~{item.Name}~s~ gegeben."); } } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index bf14ab2d..b0dbac78 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -588,8 +588,8 @@ namespace ReallifeGamemode.Server.Events dbcontext.SaveChanges(); } - //Rentcar Points - if (nearestRentcarPoint != null) + //Rentcar Points + if (nearestRentcarPoint != null) { if (player.IsInVehicle) { @@ -861,6 +861,8 @@ namespace ReallifeGamemode.Server.Events int itemIdToGive = currentModel == 3 ? cannabisItem.Id : cannabisSeedsItem.Id; int amountToGive = currentModel == 3 ? new Random().Next(4, 10) + 1 : 1; + player.SendNotification($"Du hast {(currentModel == 3 ? "das Cannabis" : "die Samen")} in den Riot geladen"); + InventoryManager.AddItemToVehicleInventory(riotVehicle, itemIdToGive, amountToGive); } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 896ee597..8cb12da7 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Id => 201; public override string Name => "Notfallkit"; public override string Description => "Fahrzeug reparieren"; - public override int Gewicht => 1000; + public override int Gewicht => 5000; public override string Einheit => "g"; public override uint Object => 875075437; public override int Price => 2500; @@ -55,12 +55,13 @@ namespace ReallifeGamemode.Server.Inventory.Items using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; + float heading = veh.Heading; player.SendNotification("Du hast ~g~" + Name + " ~s~verwendet", false); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); - serverVehicle.Spawn(veh).Position = position; Vehicle newVeh = serverVehicle.Spawn(veh); newVeh.Repair(); - newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); + newVeh.Position = position; + newVeh.Rotation = new Vector3(0, 0, heading); return true; } } diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index db220f30..b7ae3bb5 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -887,7 +887,7 @@ namespace ReallifeGamemode.Server.Managers "pounder2" }; - public VehicleManager () + public VehicleManager() { #region add_VehicleRespawnPoints VehicleRespawnPoints.Add(pos1); @@ -1114,30 +1114,24 @@ namespace ReallifeGamemode.Server.Managers vehicle.Delete(); return; } - InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); CheckVehicleDeath(vehicle.Id); } public static void CheckVehicleDeath(int id) { - using (var dbContext = new DatabaseContext()) { Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id); ServerVehicle sV = vehicle.GetServerVehicle(dbContext); - if (sV is UserVehicle) + if (sV is UserVehicle uV) { foreach (VehicleRespawnPoint point in VehicleRespawnPoints) { - if (NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) - { - ChatService.Broadcast("Fahrzeug zu nah"); - } - else + if (!NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) { sV.PositionX = point.Position.X; sV.PositionY = point.Position.Y; @@ -1147,17 +1141,20 @@ namespace ReallifeGamemode.Server.Managers break; } } + User user = dbContext.Users.Find(uV.UserId); + user.Player?.SendNotification("Dein Fahrzeug ist zerstört~n~Du kannst es im Interaktionsmenü unter \"Fahrzeuge\" orten"); vehicle.Delete(); Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); } - + if (sV is FactionVehicle || sV is GroupVehicle) { vehicle.Delete(); Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); } + InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); } } @@ -1171,26 +1168,26 @@ namespace ReallifeGamemode.Server.Managers } #region spawnpositions-vehicleInWater - public static List VehicleRespawnPoints = new List (); + public static List VehicleRespawnPoints = new List(); VehicleRespawnPoint pos1 = new VehicleRespawnPoint() - { + { Position = new Vector3(-307.84, -909.04, 31.07), Heading = 167.46f }; VehicleRespawnPoint pos2 = new VehicleRespawnPoint() { - Position = new Vector3(-311.52, -908.40, 31.07), + Position = new Vector3(-311.52, -908.40, 31.07), Heading = 170.40f }; VehicleRespawnPoint pos3 = new VehicleRespawnPoint() { - Position = new Vector3(-315.18, -907.68, 31.07), + Position = new Vector3(-315.18, -907.68, 31.07), Heading = 167.17f }; VehicleRespawnPoint pos4 = new VehicleRespawnPoint() { - Position = new Vector3(-319.09, -906.68, 31.07), + Position = new Vector3(-319.09, -906.68, 31.07), Heading = 168.41f }; VehicleRespawnPoint pos5 = new VehicleRespawnPoint() @@ -1205,27 +1202,27 @@ namespace ReallifeGamemode.Server.Managers }; VehicleRespawnPoint pos7 = new VehicleRespawnPoint() { - Position = new Vector3(-325.95, -905.17, 31.07), + Position = new Vector3(-325.95, -905.17, 31.07), Heading = 168.26f }; VehicleRespawnPoint pos8 = new VehicleRespawnPoint() { - Position = new Vector3(-329.77, -904.33, 31.07), + Position = new Vector3(-329.77, -904.33, 31.07), Heading = 168.17f }; VehicleRespawnPoint pos9 = new VehicleRespawnPoint() { - Position = new Vector3(-333.31, -903.61, 31.07), + Position = new Vector3(-333.31, -903.61, 31.07), Heading = 169.17f - }; + }; VehicleRespawnPoint pos10 = new VehicleRespawnPoint() { - Position = new Vector3(-336.86, -902.80, 31.07), + Position = new Vector3(-336.86, -902.80, 31.07), Heading = 167.65f }; VehicleRespawnPoint pos11 = new VehicleRespawnPoint() { - Position = new Vector3(-340.41, -902.12, 31.07), + Position = new Vector3(-340.41, -902.12, 31.07), Heading = 162.65f }; VehicleRespawnPoint pos12 = new VehicleRespawnPoint() @@ -1266,7 +1263,7 @@ namespace ReallifeGamemode.Server.Managers VehicleRespawnPoint pos19 = new VehicleRespawnPoint() { Position = new Vector3(-346.58, -973.31, 31.08), - Heading = -19.79f + Heading = -19.79f }; VehicleRespawnPoint pos20 = new VehicleRespawnPoint() {