This commit is contained in:
Snaiker 2021-03-05 23:05:09 +00:00
parent 4cd0b8bf3f
commit db25a6d8ee

View File

@ -1176,11 +1176,14 @@ public class RoomManager {
continue; continue;
Habbo friend = Emulator.getGameEnvironment().getHabboManager().getHabbo(buddy.getId()); Habbo friend = Emulator.getGameEnvironment().getHabboManager().getHabbo(buddy.getId());
if (friend == null)
if (friend == null || friend.getHabboInfo().getCurrentRoom() == null)
continue; continue;
rooms.add(friend.getHabboInfo().getCurrentRoom()); Room friendRoom = friend.getHabboInfo().getCurrentRoom();
if (friendRoom == null || rooms.contains(friendRoom))
continue;
rooms.add(friendRoom);
} }
Collections.sort(rooms); Collections.sort(rooms);
@ -1313,7 +1316,7 @@ public class RoomManager {
if (friend == null || friend.getHabboInfo() == null) continue; if (friend == null || friend.getHabboInfo() == null) continue;
Room room = friend.getHabboInfo().getCurrentRoom(); Room room = friend.getHabboInfo().getCurrentRoom();
if (room != null) rooms.add(room); if (room != null && !rooms.contains(room)) rooms.add(room);
if (rooms.size() >= limit) break; if (rooms.size() >= limit) break;
} }