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 'dev' into 'subscription-boxes'

Browse Source 
# Conflicts:
#   sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql
This commit is contained in:
Alejandro 2019-05-16 10:01:30 -04:00
commit 017e269062
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java
View File

@ -119,7 +119,7 @@ public class WiredEffectTriggerStacks extends InteractionWiredEffect
@Override
public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff)
{
if (stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks)
if (stuff != null && stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks)
{
return false;
}

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

@ -1691,6 +1691,8 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
}
}
HabboItem nextTileChair = this.getLowestChair(tileInFront);
for(RoomUnit unit : unitsOnTile) {
if (rolledUnitIds.contains(unit.getId())) continue;
@ -1722,14 +1724,14 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
tile.setStackHeight(ridingUnit.getZ() + zOffset);
rolledUnitIds.add(ridingUnit.getId());
updatedUnit.remove(ridingUnit);
messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight(), room));
messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight() + (nextTileChair != null ? -1 : 0), room));
isRiding = true;
}
}
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), room));
messages.add(new RoomUnitOnRollerComposer(unit, roller, unit.getCurrentLocation(), unit.getZ() + (isRiding ? 1 : 0), tile, tile.getStackHeight() + (isRiding ? 1 : 0) + (nextTileChair != null ? -1 : 0), room));
if (itemsOnRoller.isEmpty())
{