@nativewrappers/redm 0.0.61 → 0.0.63

package/entities/BaseEntity.d.ts

@@ -3,9 +3,15 @@ export declare class BaseEntity {
     private handle;
     constructor(entHandle: number);
     replaceHandle(newHandle: number): void;
+    /**
+     * @returns Returns true if the entity handle is not 0 and exists in the game engine
+     */
+    get Exists(): boolean;
     get Handle(): number;
     set Health(amount: number);
     get Health(): number;
+    get Heading(): number;
+    set Heading(heading: number);
     get Position(): Vector3;
     set Position(pos: Vector3);
 }

package/entities/BaseEntity.js

@@ -25,6 +25,12 @@ export class BaseEntity {
     replaceHandle(newHandle) {
         this.handle = newHandle;
     }
+    /**
+     * @returns Returns true if the entity handle is not 0 and exists in the game engine
+     */
+    get Exists() {
+        return this.handle !== 0 && DoesEntityExist(this.Handle);
+    }
     get Handle() {
         return this.handle;
     }
@@ -34,6 +40,12 @@ export class BaseEntity {
     get Health() {
         return GetEntityHealth(this.Handle);
     }
+    get Heading() {
+        return GetEntityHeading(this.Handle);
+    }
+    set Heading(heading) {
+        SetEntityHeading(this.Handle, heading);
+    }
     get Position() {
         return Vector3.fromArray(GetEntityCoords(this.handle, true, true));
     }

package/entities/Entity.js

@@ -2,6 +2,7 @@ import { EntityType, ForceType } from "../enums/Entity";
 import { _N } from "../utils";
 import { BaseEntity } from "./BaseEntity";
 export class Entity extends BaseEntity {
+    // NOTE: There is nothing stopping you from using creating an invalid entity, you should do your own due-diligence
     constructor(handle) {
         super(handle);
     }

package/entities/Ped.d.ts

@@ -39,8 +39,6 @@ export declare class Ped extends BaseEntity {
     get IsInjured(): boolean;
     get IsFatallyInjured(): boolean;
     get IsPlayer(): boolean;
-    get Heading(): number;
-    set Heading(heading: number);
     get IsShooting(): boolean;
     get Accuracy(): number;
     set Accuracy(accuracy: number);
@@ -48,7 +46,7 @@ export declare class Ped extends BaseEntity {
     get IsMale(): boolean;
     get IsHuman(): boolean;
     get IsOnTopOfVehicle(): boolean;
-    get Vehicle(): Vehicle;
+    get Vehicle(): Vehicle | null;
     /**
      * @returns the last mount that this ped was on, or null if it doesn't exist
      */
@@ -113,12 +111,6 @@ export declare class Ped extends BaseEntity {
      */
     setOntoMount(targetPed: Ped, seatIndex: VehicleSeat): void;
     removeFromMount(): void;
-    /**
-     *
-     * @param seatIndex the seat index to check
-     * @returns true of the specified seat is free on the mount
-     */
-    isSeatFree(seatIndex: VehicleSeat): boolean;
     /**
      * Sets the ped into the specified vehicle
      * @param vehicle the vehicle to put the ped into

package/entities/Ped.js

@@ -57,12 +57,6 @@ export class Ped extends BaseEntity {
     get IsPlayer() {
         return IsPedAPlayer(this.Handle);
     }
-    get Heading() {
-        return GetEntityHeading(this.Handle);
-    }
-    set Heading(heading) {
-        SetEntityHeading(this.Handle, heading);
-    }
     get IsShooting() {
         return IsPedShooting(this.Handle);
     }
@@ -85,7 +79,11 @@ export class Ped extends BaseEntity {
         return IsPedOnVehicle(this.Handle, false);
     }
     get Vehicle() {
-        return new Vehicle(GetVehiclePedIsIn(this.Handle, false));
+        const vehicle = GetVehiclePedIsIn(this.Handle, false);
+        if (vehicle === 0) {
+            return null;
+        }
+        return new Vehicle(vehicle);
     }
     /**
      * @returns the last mount that this ped was on, or null if it doesn't exist
@@ -194,7 +192,8 @@ export class Ped extends BaseEntity {
         return _N("0x6CFC373008A1EDAF", this.Handle, Citizen.resultAsInteger());
     }
     set IsDamaged(damaged) {
-        _N("_SET_PED_DAMAGED", this.Handle, damaged);
+        // _SET_PED_DAMAGED
+        _N("0xDACE03C65C6666DB", this.Handle, damaged);
     }
     get DamageCleanliness() {
         return _N("0x88EFFED5FE8B0B4A", this.Handle, Citizen.resultAsInteger());
@@ -257,14 +256,6 @@ export class Ped extends BaseEntity {
         // REMOVE_PED_FROM_MOUNT
         _N("0x5337B721C51883A9", this.Handle, true, true);
     }
-    /**
-     *
-     * @param seatIndex the seat index to check
-     * @returns true of the specified seat is free on the mount
-     */
-    isSeatFree(seatIndex) {
-        return _N("0xAAB0FE202E9FC9F0", this.Vehicle.Handle, seatIndex, Citizen.resultAsInteger());
-    }
     /**
      * Sets the ped into the specified vehicle
      * @param vehicle the vehicle to put the ped into

package/entities/Vehicle.d.ts

@@ -1,4 +1,11 @@
+import { VehicleSeat } from "../../redm/enums";
 import { BaseEntity } from "./BaseEntity";
 export declare class Vehicle extends BaseEntity {
     constructor(handle: number);
+    /**
+     *
+     * @param seatIndex the seat index to check
+     * @returns true of the specified seat is free on the mount
+     */
+    isSeatFree(seatIndex: VehicleSeat): boolean;
 }

package/entities/Vehicle.js

@@ -1,6 +1,15 @@
 import { BaseEntity } from "./BaseEntity";
+import { _N } from "../../redm/utils";
 export class Vehicle extends BaseEntity {
     constructor(handle) {
         super(handle);
     }
+    /**
+     *
+     * @param seatIndex the seat index to check
+     * @returns true of the specified seat is free on the mount
+     */
+    isSeatFree(seatIndex) {
+        return _N("0xAAB0FE202E9FC9F0", this.Handle, seatIndex, Citizen.resultAsInteger());
+    }
 }

package/package.json

@@ -4,7 +4,7 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"
@@ -28,6 +28,6 @@
     ".": "./index.js"
   },
   "dependencies": {
-    "@nativewrappers/common": "0.0.61"
+    "@nativewrappers/common": "0.0.63"
   }
 }