nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2025-01-19 07:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-b9c15289' into 'dev'

Browse Source 
Revert "Merge branch 'bot-rollers' into 'dev'"

See merge request morningstar/Arcturus-Community!27
This commit is contained in:
Harmonic 2019-05-12 21:37:07 -04:00
commit 3e57cfe336
1 changed files with 201 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1565,21 +1565,35 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
List<Integer> rollerFurniIds = new ArrayList<>(); List<Integer> rollerFurniIds = new ArrayList<>();
List<Integer> rolledUnitIds = new ArrayList<>(); List<Integer> rolledUnitIds = new ArrayList<>();
this.roomSpecialTypes.getRollers().forEachValue(new TObjectProcedure<InteractionRoller>()
{
@Override
public boolean execute(InteractionRoller roller)
{
//if(Double.compare(roller.getZ(), this.layout.getHeightAtSquare(roller.getX(), roller.getY())) != 0)
this.roomSpecialTypes.getRollers().forEachValue(roller -> {
//}
HabboItem newRoller = null; HabboItem newRoller = null;
THashSet<Habbo> habbosOnRoller = Room.this.getHabbosAt(roller.getX(), roller.getY()); THashSet<Habbo> habbosOnRoller = Room.this.getHabbosAt(roller.getX(), roller.getY());
THashSet<Bot> botsOnRoller = Room.this.getBotsAt(Room.this.layout.getTile(roller.getX(), roller.getY()));
THashSet<HabboItem> itemsOnRoller = new THashSet<>(); THashSet<HabboItem> itemsOnRoller = new THashSet<>();
RoomTile rollerTile = Room.this.layout.getTile(roller.getX(), roller.getY()); RoomTile rollerTile = Room.this.layout.getTile(roller.getX(), roller.getY());
itemsOnRoller.addAll(this.getItemsAt(rollerTile));
for(HabboItem item : getItemsAt(rollerTile))
{
if(item.getZ() >= roller.getZ() + Item.getCurrentHeight(roller)) {
itemsOnRoller.add(item);
}
}
itemsOnRoller.remove(roller); itemsOnRoller.remove(roller);
if (habbosOnRoller.isEmpty() && itemsOnRoller.isEmpty() && botsOnRoller.isEmpty()) if (habbosOnRoller.isEmpty())
{ {
if (itemsOnRoller.isEmpty())
return true; return true;
} }
@ -1588,7 +1602,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
if (tileInFront == null) if (tileInFront == null)
return true; return true;
if (!Room.this.layout.tileExists(tileInFront.x, tileInFront.y)) if (!Room.this.layout.tileExists(tileInFront.x, tileInFront.y))
return true; return true;
@ -1602,9 +1615,13 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
return true; return true;
THashSet<HabboItem> itemsNewTile = new THashSet<>(); THashSet<HabboItem> itemsNewTile = new THashSet<>();
itemsNewTile.addAll(getItemsAt(tileInFront));
itemsNewTile.removeAll(itemsOnRoller);
for(HabboItem item : getItemsAt(tileInFront))
{
itemsNewTile.add(item);
}
itemsNewTile.removeAll(itemsOnRoller);
List<HabboItem> toRemove = new ArrayList<>(); List<HabboItem> toRemove = new ArrayList<>();
for (HabboItem item : itemsOnRoller) for (HabboItem item : itemsOnRoller)
{ {
@ -1719,46 +1736,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
break; break;
} }
for (Bot bot: botsOnRoller)
{
if (rolledUnitIds.contains(bot.getRoomUnit().getId())) continue;
rolledUnitIds.add(bot.getRoomUnit().getId());
if (stackContainsRoller && !allowFurniture && !(topItem != null && topItem.isWalkable()))
continue;
if (!bot.getRoomUnit().hasStatus(RoomUnitStatus.MOVE))
{
RoomTile tile = tileInFront.copy();
tile.setStackHeight(bot.getRoomUnit().getZ() + zOffset);
updatedUnit.remove(bot.getRoomUnit());
messages.add(new RoomUnitOnRollerComposer(bot.getRoomUnit(), roller, bot.getRoomUnit().getCurrentLocation(), bot.getRoomUnit().getZ(), tile, tile.getStackHeight(), room));
if (itemsOnRoller.isEmpty())
{
HabboItem item = room.getTopItemAt(tileInFront.x, tileInFront.y);
if (item != null && itemsNewTile.contains(item))
{
try
{
item.onWalkOn(bot.getRoomUnit(), room, null);
} catch (Exception e)
{
Emulator.getLogging().logErrorLine(e);
}
}
}
}
if (bot.getRoomUnit().hasStatus(RoomUnitStatus.SIT))
bot.getRoomUnit().sitUpdate = true;
break;
}
} }
if (!messages.isEmpty()) if (!messages.isEmpty())
@ -1825,6 +1802,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
} }
return true; return true;
}
}); });