Merge remote-tracking branch 'origin/dev' into avatar-grayscale

src/core/utils/proxy/NitroBaseTexture.ts

@@ -0,0 +1,4 @@
+import { BaseTexture } from '@pixi/core';
+
+export class NitroBasetexture extends BaseTexture
+{}

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';

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';

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';

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