@communityox/ox_core 1.5.4 → 1.5.6

package/package/lib/server/vehicle.d.ts

@@ -1,5 +1,6 @@
 import type { OxVehicle as _OxVehicle } from '../../server/vehicle/class';
 import type { CreateVehicleData } from '../../server/vehicle';
+import type { VehicleRow } from '../../server/vehicle/db';
 declare class VehicleInterface {
     entity: number | undefined;
     netId: number | undefined;
@@ -17,9 +18,11 @@ declare class VehicleInterface {
 }
 export type OxVehicle = _OxVehicle & VehicleInterface;
 export declare function GetVehicle(entityId: number): OxVehicle;
+export declare function GetVehicle(vin: string): OxVehicle;
+export declare function GetVehicleFromEntity(entityId: number): OxVehicle;
 export declare function GetVehicleFromNetId(netId: number): OxVehicle;
 export declare function GetVehicleFromVin(vin: string): OxVehicle;
-export declare function CreateVehicle(data: CreateVehicleData, coords?: number | number[] | {
+export declare function CreateVehicle(data: string | (CreateVehicleData & Partial<VehicleRow>), coords?: number | number[] | {
     x: number;
     y: number;
     z: number;

package/package/lib/server/vehicle.js

@@ -49,8 +49,11 @@ VehicleInterface.prototype.toString = function () {
 function CreateVehicleInstance(vehicle) {
     return new VehicleInterface(vehicle.entity, vehicle.netId, vehicle.script, vehicle.plate, vehicle.model, vehicle.make, vehicle.id, vehicle.vin, vehicle.owner, vehicle.group);
 }
-export function GetVehicle(vin) {
-    return typeof vin === 'string' ? GetVehicleFromVin(vin) : CreateVehicleInstance(exports.ox_core.GetVehicle(vin));
+export function GetVehicle(handle) {
+    return typeof handle === 'string' ? GetVehicleFromVin(handle) : GetVehicleFromEntity(handle);
+}
+export function GetVehicleFromEntity(entityId) {
+    return CreateVehicleInstance(exports.ox_core.GetVehicleFromEntity(entityId));
 }
 export function GetVehicleFromNetId(netId) {
     return CreateVehicleInstance(exports.ox_core.GetVehicleFromNetId(netId));

package/package/server/groups/index.d.ts

@@ -1,6 +1,8 @@
 import type { OxGroup, CreateGroupProperties } from '../../types';
 export declare function GetGroup(name: string): OxGroup;
 export declare function GetGroupsByType(type: string): string[];
+export declare function GetGroupActivePlayers(groupName: string): number[];
+export declare function GetGroupActivePlayersByType(type: string): number[];
 export declare function SetGroupPermission(groupName: string, grade: number, permission: string, value: 'allow' | 'deny'): void;
 export declare function RemoveGroupPermission(groupName: string, grade: number, permission: string): void;
 export declare function CreateGroup(data: CreateGroupProperties): Promise<void>;

package/package/server/vehicle/class.d.ts

@@ -32,12 +32,12 @@ export declare class OxVehicle extends ClassInterface {
     static generateVin({ make, name }: VehicleData, isOwned?: boolean): Promise<string>;
     static generatePlate(): Promise<string>;
     static saveAll(resource?: string): void;
-    constructor(vin: string, script: string, plate: string, model: string, make: string, stored: string | null, metadata: Dict<any>, properties: VehicleProperties, id?: number, owner?: number, group?: string);
+    constructor(vin: string, script: string, plate: string, model: string, make: string, stored: string | null, metadata: Dict<any>, properties: Partial<VehicleProperties>, id?: number, owner?: number, group?: string);
     set(key: string, value: any): void;
     get(key: string): any;
     getState(): StateBagInterface | null;
     getStored(): string | null;
-    getProperties(): VehicleProperties;
+    getProperties(): Partial<VehicleProperties>;
     save(): Promise<number> | Promise<import("mariadb").UpsertResult | import("mariadb").UpsertResult[]> | undefined;
     despawn(save?: boolean): void;
     delete(): void;
@@ -46,6 +46,6 @@ export declare class OxVehicle extends ClassInterface {
     setOwner(charId?: number): void;
     setGroup(group?: string): void;
     setPlate(plate: string): void;
-    setProperties(properties: VehicleProperties, apply?: boolean): void;
+    setProperties(properties: Partial<VehicleProperties>, apply?: boolean): void;
     respawn(coords?: Vec3, rotation?: Vector3 | number): number | null;
 }

package/package/server/vehicle/db.d.ts

@@ -7,7 +7,7 @@ export type VehicleRow = {
     vin: string;
     model: string;
     data: {
-        properties: VehicleProperties;
+        properties: Partial<VehicleProperties>;
         [key: string]: any;
     };
 };

package/package/server/vehicle/index.d.ts

@@ -9,7 +9,7 @@ export interface CreateVehicleData {
     owner?: number;
     group?: string;
     stored?: string;
-    properties?: VehicleProperties;
+    properties?: Partial<VehicleProperties>;
 }
 export declare function CreateVehicle(data: string | (CreateVehicleData & Partial<VehicleRow>), coords?: Vec3, heading?: number, invokingScript?: string): Promise<OxVehicle>;
 export declare function SpawnVehicle(id: number | string, coords?: Vec3, heading?: number): Promise<OxVehicle | undefined>;

package/package/types/index.d.ts

@@ -114,6 +114,7 @@ export interface DbGroup {
     type?: string;
     colour?: number;
     hasAccount: boolean;
+    activePlayers: Set<number>;
 }
 export interface OxGroup extends DbGroup {
     grades: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@communityox/ox_core",
   "author": "Overextended",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "license": "LGPL-3.0-or-later",
   "description": "A modern FiveM framework.",
   "type": "module",
@@ -16,10 +16,10 @@
     "./server": "./package/lib/server/index.js"
   },
   "scripts": {
-    "build": "node build.js",
-    "watch": "node build.js --watch",
-    "format": "pnpm biome format --write",
-    "lint": "pnpm biome lint --write"
+    "build": "bun run build.js",
+    "watch": "bun run build.js --watch",
+    "format": "bun run biome format --write",
+    "lint": "bun run biome lint --write"
   },
   "keywords": [
     "fivem",