From ad84ef423e406f92ca68682ad0fb55714b0de04a Mon Sep 17 00:00:00 2001
From: Remco <habboilany@gmail.com>
Date: Mon, 4 Jan 2021 23:15:01 +0100
Subject: [PATCH] WiredConditionTriggerOnFurni now saves as JSON

---
 .../WiredConditionTriggerOnFurni.java         | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java
index 5dcfb9cc..733c8581 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java
@@ -16,6 +16,8 @@ import gnu.trove.set.hash.THashSet;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class WiredConditionTriggerOnFurni extends InteractionWiredCondition {
     public static final WiredConditionType type = WiredConditionType.TRIGGER_ON_FURNI;
@@ -67,27 +69,35 @@ public class WiredConditionTriggerOnFurni extends InteractionWiredCondition {
     @Override
     public String getWiredData() {
         this.refresh();
-
-        StringBuilder data = new StringBuilder();
-
-        for (HabboItem item : this.items) {
-            data.append(item.getId()).append(";");
-        }
-
-        return data.toString();
+        return WiredHandler.getGsonBuilder().create().toJson(new JsonData(
+                this.items.stream().map(HabboItem::getId).collect(Collectors.toList())
+        ));
     }
 
     @Override
     public void loadWiredData(ResultSet set, Room room) throws SQLException {
         this.items.clear();
+        String wiredData = set.getString("wired_data");
 
-        String[] data = set.getString("wired_data").split(";");
+        if (wiredData.startsWith("{")) {
+            JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class);
 
-        for (String s : data) {
-            HabboItem item = room.getHabboItem(Integer.parseInt(s));
+            for(int id : data.itemIds) {
+                HabboItem item = room.getHabboItem(id);
 
-            if (item != null) {
-                this.items.add(item);
+                if (item != null) {
+                    this.items.add(item);
+                }
+            }
+        } else {
+            String[] data = wiredData.split(";");
+
+            for (String s : data) {
+                HabboItem item = room.getHabboItem(Integer.parseInt(s));
+
+                if (item != null) {
+                    this.items.add(item);
+                }
             }
         }
     }
@@ -168,4 +178,12 @@ public class WiredConditionTriggerOnFurni extends InteractionWiredCondition {
     public WiredConditionOperator operator() {
         return WiredConditionOperator.AND;
     }
+
+    static class JsonData {
+        List<Integer> itemIds;
+
+        public JsonData(List<Integer> itemIds) {
+            this.itemIds = itemIds;
+        }
+    }
 }