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

Fixed a NullPointerException

Browse Source
This commit is contained in:
Beny 2019-05-17 07:33:30 +01:00
parent 9b15464fd1
commit 2e6d2b69a9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1718,14 +1718,16 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
boolean isRiding = false; boolean isRiding = false;
if(unit.getRoomUnitType() == RoomUnitType.USER) { if(unit.getRoomUnitType() == RoomUnitType.USER) {
Habbo rollingHabbo = this.getHabbo(unit); Habbo rollingHabbo = this.getHabbo(unit);
RideablePet riding = rollingHabbo.getHabboInfo().getRiding(); if(rollingHabbo != null && rollingHabbo.getHabboInfo() != null) {
if(riding != null) { RideablePet riding = rollingHabbo.getHabboInfo().getRiding();
RoomUnit ridingUnit = riding.getRoomUnit(); if (riding != null) {
tile.setStackHeight(ridingUnit.getZ() + zOffset); RoomUnit ridingUnit = riding.getRoomUnit();
rolledUnitIds.add(ridingUnit.getId()); tile.setStackHeight(ridingUnit.getZ() + zOffset);
updatedUnit.remove(ridingUnit); rolledUnitIds.add(ridingUnit.getId());
messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight() + (nextTileChair != null ? -1 : 0), room)); updatedUnit.remove(ridingUnit);
isRiding = true; messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight() + (nextTileChair != null ? -1 : 0), room));
isRiding = true;
}
} }
} }