Wired cannot trigger door when a Habbo is on it

This commit is contained in:
Ilany 2020-09-18 15:04:57 +02:00
parent 0a09ff1f41
commit 986a3b323c

View File

@ -39,16 +39,15 @@ public class InteractionGate extends HabboItem {
@Override @Override
public void onClick(GameClient client, Room room, Object[] objects) throws Exception { public void onClick(GameClient client, Room room, Object[] objects) throws Exception {
boolean isWired = (objects.length >= 2 && objects[1] instanceof WiredEffectType && objects[1] == WiredEffectType.TOGGLE_STATE); boolean executedByWired = (objects.length >= 2 && objects[1] instanceof WiredEffectType && objects[1] == WiredEffectType.TOGGLE_STATE);
if (client != null && !room.hasRights(client.getHabbo()) && !isWired)
if (client != null && !room.hasRights(client.getHabbo()) && !executedByWired)
return; return;
// If a Habbo is standing on a tile occupied by the gate, the gate shouldn't open/close // If a Habbo is standing on a tile occupied by the gate, the gate shouldn't open/close
if (!isWired) { for (RoomTile tile : room.getLayout().getTilesAt(room.getLayout().getTile(this.getX(), this.getY()), this.getBaseItem().getWidth(), this.getBaseItem().getLength(), this.getRotation()))
for (RoomTile tile : room.getLayout().getTilesAt(room.getLayout().getTile(this.getX(), this.getY()), this.getBaseItem().getWidth(), this.getBaseItem().getLength(), this.getRotation())) if (room.hasHabbosAt(tile.x, tile.y))
if (room.hasHabbosAt(tile.x, tile.y)) return;
return;
}
// Gate closed = 0, open = 1 // Gate closed = 0, open = 1
if (this.getExtradata().length() == 0) if (this.getExtradata().length() == 0)