From 12eb55637f556ccb75892c86831481ad917c7c7b Mon Sep 17 00:00:00 2001 From: Beny Date: Wed, 14 Oct 2020 23:19:15 +0200 Subject: [PATCH] Obstacle now pushes player behind if player in the way --- .../habbohotel/items/interactions/InteractionObstacle.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java index ff8b2d02..a63dcad8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java @@ -180,12 +180,12 @@ public class InteractionObstacle extends HabboItem implements ICycleable { continue; RoomTile tileInfront = room.getLayout().getTileInFront(unit.getCurrentLocation(), unit.getBodyRotation().getValue()); - if(tileInfront.state != RoomTileState.INVALID && tileInfront.state != RoomTileState.BLOCKED) { + if(tileInfront.state != RoomTileState.INVALID && tileInfront.state != RoomTileState.BLOCKED && room.getRoomUnitsAt(tileInfront).size() == 0) { unit.setGoalLocation(tileInfront); } else { RoomTile tileBehind = room.getLayout().getTileInFront(unit.getCurrentLocation(), Objects.requireNonNull(unit.getBodyRotation().getOpposite()).getValue()); - if(tileBehind.state != RoomTileState.INVALID && tileBehind.state != RoomTileState.BLOCKED) { + if(tileBehind.state != RoomTileState.INVALID && tileBehind.state != RoomTileState.BLOCKED && room.getRoomUnitsAt(tileBehind).size() == 0) { unit.setGoalLocation(tileBehind); } }