From fa81b7fc79d004468c5e6d8289675c883cb38b52 Mon Sep 17 00:00:00 2001
From: kookroach <62265045+kookroach@users.noreply.github.com>
Date: Sun, 4 Apr 2021 21:53:51 +0200
Subject: [PATCH] =?UTF-8?q?=C2=B4remove=20garbage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/rage-mp/entities.ts                  | 47 +------------------
 ReallifeGamemode.Client/core/rage-mp/game.ts  |  5 +-
 ReallifeGamemode.Client/game.ts               |  9 ----
 3 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/ReallifeGamemode.Client/core/rage-mp/entities.ts b/ReallifeGamemode.Client/core/rage-mp/entities.ts
index 8b3b91fc..389c2b9b 100644
--- a/ReallifeGamemode.Client/core/rage-mp/entities.ts
+++ b/ReallifeGamemode.Client/core/rage-mp/entities.ts
@@ -1,4 +1,4 @@
-import { IEntity, IPlayer, IEntityAttachments, IEntityAttachmentPool, IPlayerPool, IVehicle, IVehiclePool, VehicleSeat, EntityType, IObjectPool, IObject } from "../../game";
+import { IEntity, IPlayer, IEntityAttachments, IEntityAttachmentPool, IPlayerPool, IVehicle, IVehiclePool, VehicleSeat, EntityType } from "../../game";
 import { parseJson } from "../../util";
 import game from "../..";
 
@@ -190,18 +190,6 @@ class RagePlayerPool implements IPlayerPool {
     }
 }
 
-class RageObject extends RageEntity implements IObject {
-    public object: ObjectMp;
-    public __attachmentData: object;
-
-    constructor(object: ObjectMp) {
-        if (!object) {
-            throw "Object is undefined"
-        }
-        super(object);
-        this.object = object;
-    }
-}
 
 class RageVehicle extends RageEntity implements IVehicle {
     private vehicle: VehicleMp;
@@ -240,36 +228,6 @@ class RageVehicle extends RageEntity implements IVehicle {
 }
 
 
-class RageObjectPool implements IObjectPool {
-    public attachmentDataMap: Map<ObjectMp, object>;
-
-
-    setData(entity: ObjectMp, attachmentData: object): void {
-        if (!this.attachmentDataMap)
-            this.attachmentDataMap = new Map<ObjectMp, object>();
-
-        this.attachmentDataMap.set(entity, attachmentData);
-    }
-
-    at(id: number): IObject {
-        var object = mp.objects.atRemoteId(Number(id));
-
-        if (!object)
-            return null;
-
-        return new RageObject(object, this.attachmentDataMap.get(object));
-    }
-
-    forEach(fn: (entity: IObject) => void): void {
-        mp.objects.forEach(e => {
-            if (!e) {
-                game.ui.sendChatMessage("forEach - e is null");
-                return;
-            }
-            fn(new RageObject(e, this.attachmentDataMap.get(e)));
-        })
-    }
-}
 
 class RageVehiclePool implements IVehiclePool {
     at(id: number): IVehicle {
@@ -301,6 +259,5 @@ export {
     RageEntityAttachmentPool,
     RageVehicle,
     RageVehiclePool,
-    RageObject,
-    RageObjectPool,
+   
 }
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/core/rage-mp/game.ts b/ReallifeGamemode.Client/core/rage-mp/game.ts
index 106f21fb..5094ba9f 100644
--- a/ReallifeGamemode.Client/core/rage-mp/game.ts
+++ b/ReallifeGamemode.Client/core/rage-mp/game.ts
@@ -1,13 +1,12 @@
-import { IGame, IUi, IEvents, IPlayerPool, IVehiclePool,  IEntityAttachmentPool, IObjectPool } from "../../game";
+import { IGame, IUi, IEvents, IPlayerPool, IVehiclePool,  IEntityAttachmentPool } from "../../game";
 import RageEvents from "./events";
 import RageUi from "./ui";
-import { RagePlayerPool, RageVehiclePool, RageEntityAttachmentPool, RageObjectPool } from "./entities";
+import { RagePlayerPool, RageVehiclePool, RageEntityAttachmentPool } from "./entities";
 
 export default class RageGame implements IGame {
     players: IPlayerPool = new RagePlayerPool();
     vehicles: IVehiclePool = new RageVehiclePool();
     attachments: IEntityAttachmentPool = new RageEntityAttachmentPool();
-    objects: IObjectPool = new RageObjectPool();
     events: IEvents = new RageEvents;
     ui: IUi = new RageUi;
 
diff --git a/ReallifeGamemode.Client/game.ts b/ReallifeGamemode.Client/game.ts
index 44e0609b..42a0d1ed 100644
--- a/ReallifeGamemode.Client/game.ts
+++ b/ReallifeGamemode.Client/game.ts
@@ -6,7 +6,6 @@
     players: IPlayerPool;
     vehicles: IVehiclePool;
     attachments: IEntityAttachmentPool;
-    objects: IObjectPool;
 
     disableDefaultEngineBehaviour(): void;
 }
@@ -56,9 +55,6 @@ interface IPlayer extends IEntity {
     nametagColor: number;
 }
 
-interface IObject extends IEntity {
-    __attachmentData: object;
-}
 
 interface IEntityAttachments {
     remoteId: any;
@@ -80,9 +76,6 @@ interface IEntityPool<TEntity> {
     forEach(fn: (entity: TEntity) => void): void;
 }
 
-interface IObjectPool extends IEntityPool<IObject> {
-    setData(entity: ObjectMp): void;
-}
 
 interface IPlayerPool extends IEntityPool<IPlayer> {
     local: IPlayer;
@@ -159,7 +152,6 @@ export {
     IBrowser,
 
     IPlayer,
-    IObject,
     IEntityAttachments,
     IEntityAttachmentPool,
     IVehicle,
@@ -167,7 +159,6 @@ export {
     IEntityPool,
     IPlayerPool,
     IVehiclePool,
-    IObjectPool,
 
     EventName,
     Key,