@nativewrappers/fivem 0.0.89 → 0.0.92

package/World.d.ts

@@ -12,6 +12,7 @@ import type { MarkerType } from "./enums/MarkerType";
 import type { PickupType } from "./enums/PickupType";
 import { IntersectFlags } from "./enums/RaycastEnums";
 import type { RopeType } from "./enums/RopeType";
+import type { VehicleSeat } from "./enums/Vehicle";
 import { Weather } from "./enums/Weather";
 import type { BaseEntity } from "./models/BaseEntity";
 import { Ped } from "./models/Ped";
@@ -185,10 +186,21 @@ export declare abstract class World {
      * @param model Ped model to be spawned.
      * @param position World position (coordinates) of Ped spawn.
      * @param heading Heading of Ped when spawning.
-     * @param isNetwork
+     * @param shouldNetwork if the created ped should be networked to other clients
      * @returns Ped object.
      */
-    static createPed(model: Model, position: Vector3, heading?: number, isNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
+    static createPed(model: Model, position: Vector3, heading?: number, shouldNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
+    /**
+     * Created a ped in the specified vehicle
+     *
+     * @param vehicle the vehicle to create the ped in
+     * @param model Ped model to be spawned.
+     * @param seat the seat to spawn the ped into
+     * @param heading Heading of Ped when spawning.
+     * @param shouldNetwork if the created ped should be networked
+     * @returns the ped that was created, or null if it doesn't exist.
+     */
+    static createPedInsideVehicle(vehicle: Vehicle, model: Model, seat: VehicleSeat, shouldNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
     /**
      * Creates a [[`Ped`]] with a random model.
      *

package/World.js

@@ -334,14 +334,32 @@ class World {
    * @param model Ped model to be spawned.
    * @param position World position (coordinates) of Ped spawn.
    * @param heading Heading of Ped when spawning.
-   * @param isNetwork
+   * @param shouldNetwork if the created ped should be networked to other clients
    * @returns Ped object.
    */
-  static async createPed(model, position, heading = 0, isNetwork = true, pinToScript = true) {
+  static async createPed(model, position, heading = 0, shouldNetwork = true, pinToScript = true) {
+    if (!model.IsPed || !await model.request(1e3)) {
+      return null;
+    }
+    const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, shouldNetwork, pinToScript);
+    model.markAsNoLongerNeeded();
+    return Ped.fromHandle(ped);
+  }
+  /**
+   * Created a ped in the specified vehicle
+   *
+   * @param vehicle the vehicle to create the ped in
+   * @param model Ped model to be spawned.
+   * @param seat the seat to spawn the ped into
+   * @param heading Heading of Ped when spawning.
+   * @param shouldNetwork if the created ped should be networked
+   * @returns the ped that was created, or null if it doesn't exist.
+   */
+  static async createPedInsideVehicle(vehicle, model, seat, shouldNetwork = true, pinToScript = true) {
     if (!model.IsPed || !await model.request(1e3)) {
       return null;
     }
-    const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, isNetwork, pinToScript);
+    const ped = CreatePedInsideVehicle(vehicle.Handle, -1, model.Hash, seat, shouldNetwork, pinToScript);
     model.markAsNoLongerNeeded();
     return Ped.fromHandle(ped);
   }
@@ -379,9 +397,7 @@ class World {
       return null;
     }
     const vehicle = CreateVehicle(model.Hash, position.x, position.y, position.z, heading, isNetwork, pinToScript);
-    if (vehicle === 0) {
-      return null;
-    }
+    model.markAsNoLongerNeeded();
     return new Vehicle(vehicle);
   }
   /**
@@ -816,10 +832,7 @@ class World {
    */
   static getClosestObject(model, coords, radius = 25, isMission = false) {
     const prop = GetClosestObjectOfType(coords.x, coords.y, coords.z, radius, model.Hash, isMission, false, false);
-    if (prop !== 0) {
-      return new Prop(prop);
-    }
-    return null;
+    return Prop.fromHandle(prop);
   }
   /**
    * Get all [[`Prop`]] entities in your own scope.
@@ -828,9 +841,7 @@ class World {
    */
   static getAllProps() {
     const handles = GetGamePool("CObject");
-    const props = [];
-    handles.forEach((handle) => props.push(new Prop(handle)));
-    return props;
+    return handles.map((handle) => new Prop(handle));
   }
   /**
    * Get all [[`Rope`]] entities in your own scope.
@@ -839,9 +850,7 @@ class World {
    */
   static getAllRopes() {
     const handles = GetAllRopes();
-    const props = [];
-    handles.forEach((handle) => props.push(new Rope(handle)));
-    return props;
+    return handles.map((handle) => new Rope(handle));
   }
   /**
    * Get all [[`Ped`]] entities in your own scope.
@@ -850,9 +859,7 @@ class World {
    */
   static getAllPeds() {
     const handles = GetGamePool("CPed");
-    const peds = [];
-    handles.forEach((handle) => peds.push(new Ped(handle)));
-    return peds;
+    return handles.map((handle) => new Ped(handle));
   }
   /**
    * Get all [[`Vehicle`]] entities in your own scope.
@@ -861,9 +868,7 @@ class World {
    */
   static getAllVehicles() {
     const handles = GetGamePool("CVehicle");
-    const vehicles = [];
-    handles.forEach((handle) => vehicles.push(new Vehicle(handle)));
-    return vehicles;
+    return handles.map((handle) => new Vehicle(handle));
   }
   /**
    * Gets the cloest [[`Vehicle`]] to the current coords, or null if none are found
@@ -893,9 +898,7 @@ class World {
    */
   static getAllPickups() {
     const handles = GetGamePool("CPickup");
-    const pickups = [];
-    handles.forEach((handle) => pickups.push(new Pickup(handle)));
-    return pickups;
+    return handles.map((handle) => new Pickup(handle));
   }
   static currentCloudHat = CloudHat.Clear;
   static cloudHatDict = /* @__PURE__ */ new Map([

package/common/decors/Events.js

@@ -123,11 +123,13 @@ function ConVar(name, is_floating_point, deserialize) {
         }
       } else if (default_type === "boolean") {
         con_var_type = 3 /* Boolean */;
-      } else if (default_value === "string") {
+      } else if (default_type === "string") {
         con_var_type = 0 /* String */;
       }
       if (!deserialize && con_var_type === null) {
-        throw new Error("You should provide a deserialize function if you want to convert this to an object type");
+        throw new Error(
+          `Failed to determine what to use to deserialize '${name}' was for var had type '${default_type}' which can't be deserialized without providing your own deserialize function.`
+        );
       }
       if (con_var_type === null) {
         con_var_type = 0 /* String */;

package/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "type": "module",
-  "version": "0.0.89",
+  "version": "0.0.92",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"