@nativewrappers/fivem 0.0.103 → 0.0.105

package/models/BaseEntity.d.ts

@@ -184,4 +184,14 @@ export declare abstract class BaseEntity {
      * @deprecated use [[IsMissionEntity]] setter as false instead.
      */
     markAsNoLongerNeeded(): void;
+    /**
+     * @returns the current interior id that the entity is in, or 0 if they're outside
+     */
+    get Interior(): number;
+    /**
+     * @returns the room key hash that the entity is in, or 0 if they're outside
+     */
+    get RoomKey(): number;
+    clearInterior(): void;
+    forceRoom(interiorId: number, roomKey: number): void;
 }

package/models/BaseEntity.js

@@ -549,6 +549,24 @@ class BaseEntity {
   markAsNoLongerNeeded() {
     SetEntityAsNoLongerNeeded(this.Handle);
   }
+  /**
+   * @returns the current interior id that the entity is in, or 0 if they're outside
+   */
+  get Interior() {
+    return GetInteriorFromEntity(this.handle);
+  }
+  /**
+   * @returns the room key hash that the entity is in, or 0 if they're outside
+   */
+  get RoomKey() {
+    return GetRoomKeyFromEntity(this.handle);
+  }
+  clearInterior() {
+    ClearInteriorForEntity(this.handle);
+  }
+  forceRoom(interiorId, roomKey) {
+    ForceRoomForEntity(this.handle, interiorId, roomKey);
+  }
 }
 export {
   BaseEntity

package/models/Player.d.ts

@@ -11,8 +11,16 @@ export declare class Player {
     private source;
     private type;
     static AllPlayers(excludeLocalPlayer?: boolean): IterableIterator<Player>;
-    static fromPedHandle(handle: number): Player;
-    static fromServerId(serverId: number): Player;
+    /**
+     * @param handle the handoe of the ped to get the player of
+     * @returns the player, or null if the player doesn't exist
+     */
+    static fromPedHandle(handle: number): Player | null;
+    /**
+     * @param serverId the server id to get the player of
+     * @returns the player, or null if the player doesn't exist
+     */
+    static fromServerId(serverId: number): Player | null;
     /**
      * @param [minimumDistance=Number.MAX_VALUE] the minimum distance this should check
      * @param [fromPlayer=GameConstants.Player] the player to get the distance from

package/models/Player.js

@@ -25,11 +25,27 @@ class Player {
       yield new Player(ply);
     }
   }
+  /**
+   * @param handle the handoe of the ped to get the player of
+   * @returns the player, or null if the player doesn't exist
+   */
   static fromPedHandle(handle) {
-    return new Player(NetworkGetPlayerIndexFromPed(handle));
+    const playerHandle = NetworkGetPlayerIndexFromPed(handle);
+    if (!handle) {
+      return null;
+    }
+    return new Player(playerHandle);
   }
+  /**
+   * @param serverId the server id to get the player of
+   * @returns the player, or null if the player doesn't exist
+   */
   static fromServerId(serverId) {
-    return new Player(GetPlayerFromServerId(serverId));
+    const player = GetPlayerFromServerId(serverId);
+    if (player === -1) {
+      return null;
+    }
+    return new Player(player);
   }
   /**
    * @param [minimumDistance=Number.MAX_VALUE] the minimum distance this should check

package/package.json

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