From 98162ee10f6d61db5441da01577c688fe111ee70 Mon Sep 17 00:00:00 2001
From: Florent Banneux <banneuxf@gmail.com>
Date: Thu, 16 Jan 2025 02:57:39 +0100
Subject: [PATCH] fix #1997: allow continue walking while double clicking wired

---
 .../rooms/items/ToggleFloorItemEvent.java     | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java
index 50376ae8..9a446d95 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java
@@ -18,9 +18,15 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
 public class ToggleFloorItemEvent extends MessageHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(ToggleFloorItemEvent.class);
 
+    private static HashSet<String> PET_BOXES = new HashSet<>(Arrays.asList("val11_present", "gnome_box", "leprechaun_box", "velociraptor_egg", "pterosaur_egg", "petbox_epic"));
+
     @Override
     public void handle() throws Exception {
         try {
@@ -90,19 +96,18 @@ public class ToggleFloorItemEvent extends MessageHandler {
                 }
             }*/
 
-            //Do not move to onClick(). Wired could trigger it.
+            // Do not move to onClick(). Wired could trigger it.
             if (item instanceof InteractionMonsterPlantSeed) {
                 Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId()));
-                int rarity = 0;
 
                 boolean isRare = item.getBaseItem().getName().contains("rare");
+                int rarity = 0;
 
-                if ((!item.getExtradata().isEmpty() && Integer.valueOf(item.getExtradata()) - 1 < 0) || item.getExtradata().isEmpty()) {
+                if (item.getExtradata().isEmpty() || Integer.parseInt(item.getExtradata()) - 1 < 0) {
                     rarity = isRare ? InteractionMonsterPlantSeed.randomGoldenRarityLevel() : InteractionMonsterPlantSeed.randomRarityLevel();
-                }
-                else {
+                } else {
                     try {
-                        rarity = Integer.valueOf(item.getExtradata()) - 1;
+                        rarity = Integer.parseInt(item.getExtradata()) - 1;
                     } catch (Exception e) {
                     }
                 }
@@ -116,22 +121,12 @@ public class ToggleFloorItemEvent extends MessageHandler {
                 return;
             }
 
-            if (
-                    (item.getBaseItem().getName().equalsIgnoreCase("val11_present") ||
-                            item.getBaseItem().getName().equalsIgnoreCase("gnome_box") ||
-                            item.getBaseItem().getName().equalsIgnoreCase("leprechaun_box") ||
-                            item.getBaseItem().getName().equalsIgnoreCase("velociraptor_egg") ||
-                            item.getBaseItem().getName().equalsIgnoreCase("pterosaur_egg") ||
-                            item.getBaseItem().getName().equalsIgnoreCase("petbox_epic")) && room.getCurrentPets().size() < Room.MAXIMUM_PETS) {
+            if (PET_BOXES.contains(item.getBaseItem().getName()) && room.getCurrentPets().size() < Room.MAXIMUM_PETS) {
                 this.client.sendResponse(new PetPackageComposer(item));
                 return;
             }
 
             item.onClick(this.client, room, new Object[]{state});
-
-            if (item instanceof InteractionWired) {
-                this.client.getHabbo().getRoomUnit().setGoalLocation(this.client.getHabbo().getRoomUnit().getCurrentLocation());
-            }
         } catch (Exception e) {
             LOGGER.error("Caught exception", e);
         }