nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-02 05:25:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '694-multiple-users-on-rollers' into 'dev'

Browse Source 
Config value added for amount of users to roll - hotel.room.rollers.roll_avatars.max

See merge request morningstar/Arcturus-Community!283
This commit is contained in:
Beny 2020-09-01 14:53:16 -04:00
commit 2f1205f5e6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -114,6 +114,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
public static int IDLE_CYCLES = 240;
public static int IDLE_CYCLES_KICK = 480;
public static String PREFIX_FORMAT = "[<font color=\"%color%\">%prefix%</font>] ";
public static int ROLLERS_MAXIMUM_ROLL_AVATARS = 1;
static {
for (int i = 1; i <= 3; i++) {
@ -1409,9 +1410,13 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
HabboItem nextTileChair = this.getLowestChair(tileInFront);
THashSet<Integer> usersRolledThisTile = new THashSet<>();
for (RoomUnit unit : unitsOnTile) {
if (rolledUnitIds.contains(unit.getId())) continue;
if(usersRolledThisTile.size() >= Room.ROLLERS_MAXIMUM_ROLL_AVATARS) break;
if (stackContainsRoller && !allowFurniture && !(topItem != null && topItem.isWalkable()))
continue;
@ -1446,6 +1451,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
}
}
usersRolledThisTile.add(unit.getId());
rolledUnitIds.add(unit.getId());
updatedUnit.remove(unit);
messages.add(new RoomUnitOnRollerComposer(unit, roller, unit.getCurrentLocation(), unit.getZ() + (isRiding ? 1 : 0), tile, tile.getStackHeight() + (isRiding ? 1 : 0) + (nextTileChair != null ? -1 : 0), room));
@ -1469,7 +1475,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (unit.hasStatus(RoomUnitStatus.SIT)) {
unit.sitUpdate = true;
}
break;
}
}

1
src/main/java/com/eu/habbo/plugin/PluginManager.java
View File

@ -106,6 +106,7 @@ public class PluginManager {
Room.HAND_ITEM_TIME = Emulator.getConfig().getInt("hotel.rooms.handitem.time");
Room.IDLE_CYCLES = Emulator.getConfig().getInt("hotel.roomuser.idle.cycles", 240);
Room.IDLE_CYCLES_KICK = Emulator.getConfig().getInt("hotel.roomuser.idle.cycles.kick", 480);
Room.ROLLERS_MAXIMUM_ROLL_AVATARS = Emulator.getConfig().getInt("hotel.room.rollers.roll_avatars.max", 1);
RoomManager.MAXIMUM_ROOMS_VIP = Emulator.getConfig().getInt("hotel.max.rooms.vip");
RoomManager.MAXIMUM_ROOMS_USER = Emulator.getConfig().getInt("hotel.max.rooms.user");
RoomManager.HOME_ROOM_ID = Emulator.getConfig().getInt("hotel.home.room");