From 35f13902ce4eb3a760ca55625cff3356c64187c6 Mon Sep 17 00:00:00 2001
From: Alejandro <25-alejandro@users.noreply.git.krews.org>
Date: Fri, 24 Jan 2020 19:36:59 +0200
Subject: [PATCH] Make avatar walk to switch if not already adjacent to it
 (fixes #313)

---
 .../items/interactions/InteractionSwitch.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitch.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitch.java
index 87543a07..e1761878 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitch.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitch.java
@@ -1,14 +1,18 @@
 package com.eu.habbo.habbohotel.items.interactions;
 
+import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.items.Item;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomLayout;
 import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.threading.runnables.RoomUnitWalkToLocation;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class InteractionSwitch extends InteractionDefault {
     public InteractionSwitch(ResultSet set, Item baseItem) throws SQLException {
@@ -43,12 +47,22 @@ public class InteractionSwitch extends InteractionDefault {
             RoomTile closestTile = null;
             for (RoomTile tile : room.getLayout().getTilesAround(room.getLayout().getTile(this.getX(), this.getY()))) {
                 if (tile.isWalkable() && (closestTile == null || closestTile.distance(client.getHabbo().getRoomUnit().getCurrentLocation()) > tile.distance(client.getHabbo().getRoomUnit().getCurrentLocation()))) {
-                    closestTile = client.getHabbo().getRoomUnit().getCurrentLocation();
+                    closestTile = tile;
                 }
             }
 
-            if (closestTile != null) {
+            if (closestTile != null && !closestTile.equals(client.getHabbo().getRoomUnit().getCurrentLocation())) {
+                List<Runnable> onSuccess = new ArrayList<>();
+                onSuccess.add(() -> {
+                    try {
+                        this.onClick(client, room, objects);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                });
+
                 client.getHabbo().getRoomUnit().setGoalLocation(closestTile);
+                Emulator.getThreading().run(new RoomUnitWalkToLocation(client.getHabbo().getRoomUnit(), closestTile, room, onSuccess, new ArrayList<>()));
             }
         }