rock-mod 0.14.0 → 0.15.1

package/dist/server/entities/common/colshape/IColshapesManager.d.ts

@@ -1,14 +1,12 @@
 import { type IWorldObjectCreateOptions, type IWorldObjectsManager } from "../worldObject";
 import { type IColshape } from "./IColshape";
-import { type IVector2D } from "../../../../shared/common/utils";
 import { type ICircleColshape } from "./ICircleColshape";
 import { type ICuboidColshape } from "./ICuboidColshape";
 import { type ICylinderColshape } from "./ICylinderColshape";
 import { type IRectangleColshape } from "./IRectangleColshape";
 import { type ISphereColshape } from "./ISphereColshape";
 import { type IPlayer } from "../player";
-export interface ICircleColshapeCreateOptions extends Omit<IWorldObjectCreateOptions, "position"> {
-    position: IVector2D;
+export interface ICircleColshapeCreateOptions extends IWorldObjectCreateOptions {
     range: number;
 }
 export interface ICuboidColshapeCreateOptions extends IWorldObjectCreateOptions {

package/dist/server/entities/ragemp/baseObject/RageBaseObject.js

@@ -2,7 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RageBaseObject = void 0;
 // RAGEMP BUG: event 'entityDestroyed' is not callable
-const unsupportedRageEntityTypes = new Set(["blip", "colshape", "object", "ped", "vehicle"]);
+const unsupportedRageEntityTypes = new Set([
+    "blip",
+    "colshape",
+    "marker",
+    "object",
+    "ped",
+    "vehicle",
+]);
 class RageBaseObject {
     _mpEntity;
     get id() {

package/dist/server/entities/ragemp/colshape/RageColshape.d.ts

@@ -1,5 +1,7 @@
 import { type IRageWorldObjectOptions, RageWorldObject } from "../worldObject/RageWorldObject";
+import { type IVector3D } from "../../../../shared";
 export interface IRageColshapeOptions extends IRageWorldObjectOptions<ColshapeMp> {
+    position: IVector3D;
 }
 export declare abstract class RageColshape extends RageWorldObject<ColshapeMp> {
     protected constructor(options: IRageColshapeOptions);

package/dist/server/entities/ragemp/colshape/RageColshapesManager.js

@@ -35,7 +35,7 @@ class RageColshapesManager extends RageWorldObjectsManager_1.RageWorldObjectsMan
         const { x, y } = position;
         const mpEntity = mp.colshapes.newCircle(x, y, range, dimension);
         mpEntity.isExists = () => mp.colshapes.exists(mpEntity);
-        const colshape = new RageCircleColshape_1.RageCircleColshape({ mpEntity });
+        const colshape = new RageCircleColshape_1.RageCircleColshape({ mpEntity, position });
         this.registerBaseObject(colshape);
         return colshape;
     }
@@ -44,7 +44,7 @@ class RageColshapesManager extends RageWorldObjectsManager_1.RageWorldObjectsMan
         const { x, y, z } = position;
         const mpEntity = mp.colshapes.newCuboid(x, y, z, width, depth, height, dimension);
         mpEntity.isExists = () => mp.colshapes.exists(mpEntity);
-        const colshape = new RageCuboidColshape_1.RageCuboidColshape({ mpEntity });
+        const colshape = new RageCuboidColshape_1.RageCuboidColshape({ mpEntity, position });
         this.registerBaseObject(colshape);
         return colshape;
     }
@@ -53,7 +53,7 @@ class RageColshapesManager extends RageWorldObjectsManager_1.RageWorldObjectsMan
         const { x, y, z } = position;
         const mpEntity = mp.colshapes.newTube(x, y, z, height, range, dimension);
         mpEntity.isExists = () => mp.colshapes.exists(mpEntity);
-        const colshape = new RageCylinderColshape_1.RageCylinderColshape({ mpEntity });
+        const colshape = new RageCylinderColshape_1.RageCylinderColshape({ mpEntity, position });
         this.registerBaseObject(colshape);
         return colshape;
     }
@@ -62,7 +62,7 @@ class RageColshapesManager extends RageWorldObjectsManager_1.RageWorldObjectsMan
         const { x, y } = position;
         const mpEntity = mp.colshapes.newRectangle(x, y, width, height, dimension);
         mpEntity.isExists = () => mp.colshapes.exists(mpEntity);
-        const colshape = new RageRectangleColshape_1.RageRectangleColshape({ mpEntity });
+        const colshape = new RageRectangleColshape_1.RageRectangleColshape({ mpEntity, position });
         this.registerBaseObject(colshape);
         return colshape;
     }
@@ -71,7 +71,7 @@ class RageColshapesManager extends RageWorldObjectsManager_1.RageWorldObjectsMan
         const { x, y, z } = position;
         const mpEntity = mp.colshapes.newSphere(x, y, z, range, dimension);
         mpEntity.isExists = () => mp.colshapes.exists(mpEntity);
-        const colshape = new RageSphereColshape_1.RageSphereColshape({ mpEntity });
+        const colshape = new RageSphereColshape_1.RageSphereColshape({ mpEntity, position });
         this.registerBaseObject(colshape);
         return colshape;
     }

package/dist/server/entities/ragemp/worldObject/RageWorldObject.d.ts

@@ -1,9 +1,11 @@
 import { type IWorldObject } from "../../common/worldObject/IWorldObject";
 import { type IRageBaseObjectOptions, RageBaseObject } from "../baseObject/RageBaseObject";
-import { Vector3D } from "../../../../shared/common/utils/math/Vectors";
+import { type IVector3D, Vector3D } from "../../../../shared/common/utils/math/Vectors";
 export interface IRageWorldObjectOptions<T extends EntityMp> extends IRageBaseObjectOptions<T> {
+    position?: IVector3D;
 }
 export declare abstract class RageWorldObject<T extends EntityMp> extends RageBaseObject<T> implements IWorldObject {
+    private _position?;
     get position(): Vector3D;
     get dimension(): number;
     protected constructor(options: IRageWorldObjectOptions<T>);

package/dist/server/entities/ragemp/worldObject/RageWorldObject.js

@@ -4,8 +4,9 @@ exports.RageWorldObject = void 0;
 const RageBaseObject_1 = require("../baseObject/RageBaseObject");
 const Vectors_1 = require("../../../../shared/common/utils/math/Vectors");
 class RageWorldObject extends RageBaseObject_1.RageBaseObject {
+    _position;
     get position() {
-        const { x, y, z } = this.mpEntity.position;
+        const { x, y, z } = this.mpEntity.position ?? this._position;
         return new Vectors_1.Vector3D(x, y, z);
     }
     get dimension() {
@@ -13,8 +14,12 @@ class RageWorldObject extends RageBaseObject_1.RageBaseObject {
     }
     constructor(options) {
         super(options);
+        if (options.position)
+            this._position = options.position;
     }
     setPosition(value) {
+        if (this._position)
+            this._position = value;
         this.mpEntity.position = new mp.Vector3(value);
     }
     setDimension(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rock-mod",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "Rock-Mod is a powerful framework designed for creating and managing mods for Grand Theft Auto (GTA) games.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",