fix merge

This commit is contained in:
hydrant
2021-05-27 21:12:44 +02:00
parent 60f55e0eeb
commit 48b4cc22a7

View File

@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
return false; return false;
} }
if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) if ((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH)
{ {
player.SendNotification("Du kannst den Waffentransporter nicht reparieren!"); player.SendNotification("Du kannst den Waffentransporter nicht reparieren!");
return false; return false;
@@ -55,9 +55,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
Vector3 position = veh.Position; Vector3 position = veh.Position;
player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet", false); player.SendNotification("Du hast ~g~" + Name + " ~s~verwendet", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext);
serverVehicle.Spawn(veh).Position = position; serverVehicle.Spawn(veh).Position = position;
Vehicle newVeh = serverVehicle.Spawn(veh); Vehicle newVeh = serverVehicle.Spawn(veh);