From 7f8e04e290c809eb8f9753bec310828ad5c41891 Mon Sep 17 00:00:00 2001 From: Bill Date: Tue, 31 Aug 2021 23:48:04 -0400 Subject: [PATCH 1/3] Fix badges in preview images --- src/nitro/room/RoomEngine.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index b91b61f4..cbc50fd4 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -2377,7 +2377,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { if(!this._sessionDataManager) return; - const roomObject = this.getRoomObjectFloor(roomId, objectId); + let roomObject: IRoomObjectController = null; + + if(roomId === 0) + { + const room = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); + + if(room) roomObject = (room.getRoomObject(objectId, objectCategory) as IRoomObjectController); + } + else + { + roomObject = this.getRoomObjectFloor(roomId, objectId); + } if(!roomObject || !roomObject.logic) return; @@ -3520,7 +3531,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato if(split.length <= 0) return -1; - return parseInt(split[0]); + return (parseInt(split[0]) || 0); } private getRoomObjectRoomId(object: IRoomObject): string From eb28dd80e252ddbc2b0e49059e4b3e1c1a28a1ac Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 1 Sep 2021 12:34:10 -0400 Subject: [PATCH 2/3] Fix export --- src/nitro/communication/messages/incoming/user/index.ts | 1 + src/nitro/communication/messages/parser/user/index.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/nitro/communication/messages/incoming/user/index.ts b/src/nitro/communication/messages/incoming/user/index.ts index f95ca938..45d305a6 100644 --- a/src/nitro/communication/messages/incoming/user/index.ts +++ b/src/nitro/communication/messages/incoming/user/index.ts @@ -1,6 +1,7 @@ export * from './access'; export * from './ApproveNameMessageEvent'; export * from './data'; +export * from './GuildMembershipsMessageEvent'; export * from './IgnoredUsersEvent'; export * from './IgnoreResultEvent'; export * from './InClientLinkEvent'; diff --git a/src/nitro/communication/messages/parser/user/index.ts b/src/nitro/communication/messages/parser/user/index.ts index 559d2c8a..499282bb 100644 --- a/src/nitro/communication/messages/parser/user/index.ts +++ b/src/nitro/communication/messages/parser/user/index.ts @@ -1,6 +1,7 @@ export * from './access'; export * from './ApproveNameResultParser'; export * from './data'; +export * from './HabboGroupEntryData'; export * from './IgnoredUsersParser'; export * from './IgnoreResultParser'; export * from './InClientLinkParser'; From 29e7d2631ab942cd197afbe0597b5fccf94008b9 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 1 Sep 2021 13:25:06 -0400 Subject: [PATCH 3/3] Add base texture proxy --- src/core/utils/proxy/NitroBaseTexture.ts | 4 ++++ src/core/utils/proxy/index.ts | 1 + 2 files changed, 5 insertions(+) create mode 100644 src/core/utils/proxy/NitroBaseTexture.ts diff --git a/src/core/utils/proxy/NitroBaseTexture.ts b/src/core/utils/proxy/NitroBaseTexture.ts new file mode 100644 index 00000000..1cee1678 --- /dev/null +++ b/src/core/utils/proxy/NitroBaseTexture.ts @@ -0,0 +1,4 @@ +import { BaseTexture } from '@pixi/core'; + +export class NitroBasetexture extends BaseTexture +{} diff --git a/src/core/utils/proxy/index.ts b/src/core/utils/proxy/index.ts index e1fc28b5..43979ba8 100644 --- a/src/core/utils/proxy/index.ts +++ b/src/core/utils/proxy/index.ts @@ -1,6 +1,7 @@ export * from './INitroPoint'; export * from './NitroAdjustmentFilter'; export * from './NitroAlphaFilter'; +export * from './NitroBaseTexture'; export * from './NitroContainer'; export * from './NitroFilter'; export * from './NitroPoint';