@nativewrappers/redm 0.0.96 → 0.0.98

package/entities/Ped.d.ts

@@ -7,7 +7,7 @@ import { Attributes } from "../Attribute";
 import type { KnockOffVehicle, TamingState, eDamageCleanliness } from "../enums/Ped";
 import type { VehicleSeat } from "../enums/VehicleSeat";
 import { BaseEntity } from "./BaseEntity";
-import type { Player } from "./Player";
+import { Player } from "./Player";
 import { Vehicle } from "./Vehicle";
 export declare class Ped extends BaseEntity {
     private attributes;
@@ -24,6 +24,7 @@ export declare class Ped extends BaseEntity {
     static fromNetworkId(netId: number): Ped | null;
     static fromStateBagName(bagName: string): Ped | null;
     constructor(handle: number);
+    get Player(): Player | null;
     /**
      * @returns the current horse or vehicle the ped is on, or null if they're not on either
      */

package/entities/Ped.js

@@ -5,6 +5,7 @@ import { ItemAddReason } from "../inventory/InventoryTypes";
 import { _N } from "../utils/Native";
 import { Attributes } from "../Attribute";
 import { BaseEntity } from "./BaseEntity";
+import { Player } from "./Player";
 import { Vehicle } from "./Vehicle";
 class Ped extends BaseEntity {
   static {
@@ -42,6 +43,13 @@ class Ped extends BaseEntity {
   constructor(handle) {
     super(handle);
   }
+  get Player() {
+    const playerId = NetworkGetPlayerIndexFromPed(this.handle);
+    if (playerId !== 255) {
+      return new Player(playerId);
+    }
+    return null;
+  }
   /**
    * @returns the current horse or vehicle the ped is on, or null if they're not on either
    */

package/entities/Player.d.ts

@@ -13,19 +13,20 @@ export declare class Player {
      * @param [fromPlayer=GameConstants.Player] the player to get the distance from
      * @returns the closest player from {@param fromPlayer} and the distance the player was
      */
-    static getClosestPlayerPedWithDistance(minimumDistance?: number, fromPlayer?: Player): [Ped | null, number];
+    static getClosestPlayerWithDistance(minimumDistance?: number, fromPlayer?: Player): [Player | null, number];
     /**
      * @param [minimumDistance=Number.MAX_VALUE] the minimum distance this should check
      * @param [fromPlayer=GameConstants.Player] the player to get the distance from
      * @returns the closest player from {@param fromPlayer} and the distance the player was
      */
-    static getClosestPlayerPed(minimumDistance?: number, fromPlayer?: Player): Ped | null;
+    static getClosestPlayer(minimumDistance?: number, fromPlayer?: Player): Player | null;
     /**
      * @param handle the player handle
      */
     constructor(handle: number);
     get Handle(): number;
     get Ped(): Ped;
+    get ServerId(): number;
     /**
      * Adds the amount of stamina player has on the hud
      * @param amount the amount of upgrade to give 6 is half the bar while 12 is the full bar

package/entities/Player.js

@@ -43,7 +43,7 @@ class Player {
    * @param [fromPlayer=GameConstants.Player] the player to get the distance from
    * @returns the closest player from {@param fromPlayer} and the distance the player was
    */
-  static getClosestPlayerPedWithDistance(minimumDistance = Number.MAX_VALUE, fromPlayer = GameConstants.Player) {
+  static getClosestPlayerWithDistance(minimumDistance = Number.MAX_VALUE, fromPlayer = GameConstants.Player) {
     const ped = fromPlayer.Ped;
     const pos = ped.Position;
     const data = [null, Number.MAX_VALUE];
@@ -51,7 +51,7 @@ class Player {
       const tgtPed = ply.Ped;
       const dist = pos.distance(tgtPed.Position);
       if (dist < data[1] && dist < minimumDistance) {
-        data[0] = tgtPed;
+        data[0] = ply;
         data[1] = dist;
       }
     }
@@ -62,8 +62,8 @@ class Player {
    * @param [fromPlayer=GameConstants.Player] the player to get the distance from
    * @returns the closest player from {@param fromPlayer} and the distance the player was
    */
-  static getClosestPlayerPed(minimumDistance = Number.MAX_VALUE, fromPlayer = GameConstants.Player) {
-    const data = this.getClosestPlayerPedWithDistance(minimumDistance, fromPlayer);
+  static getClosestPlayer(minimumDistance = Number.MAX_VALUE, fromPlayer = GameConstants.Player) {
+    const data = this.getClosestPlayerWithDistance(minimumDistance, fromPlayer);
     return data[0];
   }
   /**
@@ -78,6 +78,9 @@ class Player {
   get Ped() {
     return new Ped(GetPlayerPed(this.handle));
   }
+  get ServerId() {
+    return GetPlayerServerId(this.handle);
+  }
   /**
    * Adds the amount of stamina player has on the hud
    * @param amount the amount of upgrade to give 6 is half the bar while 12 is the full bar

package/package.json

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