From b6b4ac936efd7116f36177b163154398beee7c21 Mon Sep 17 00:00:00 2001
From: Remco <habboilany@gmail.com>
Date: Mon, 4 Jan 2021 22:42:13 +0100
Subject: [PATCH] WiredConditionNotFurniTypeMatch now saves as JSON

---
 .../WiredConditionNotFurniTypeMatch.java      | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniTypeMatch.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniTypeMatch.java
index d9b6d466..30c9ea51 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniTypeMatch.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniTypeMatch.java
@@ -14,6 +14,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 WiredConditionNotFurniTypeMatch extends InteractionWiredCondition {
     public static final WiredConditionType type = WiredConditionType.NOT_STUFF_IS;
@@ -50,23 +52,37 @@ public class WiredConditionNotFurniTypeMatch 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("{")) {
+            WiredConditionFurniTypeMatch.JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, WiredConditionFurniTypeMatch.JsonData.class);
 
-        for (String s : data)
-            this.items.add(room.getHabboItem(Integer.valueOf(s)));
+            for(int id : data.itemIds) {
+                HabboItem item = room.getHabboItem(id);
+
+                if (item != null) {
+                    this.items.add(item);
+                }
+            }
+        } else {
+            String[] data = set.getString("wired_data").split(";");
+
+            for (String s : data) {
+                HabboItem item = room.getHabboItem(Integer.parseInt(s));
+
+                if (item != null) {
+                    this.items.add(item);
+                }
+            }
+        }
     }
 
     @Override
@@ -138,4 +154,12 @@ public class WiredConditionNotFurniTypeMatch extends InteractionWiredCondition {
             this.items.remove(item);
         }
     }
+
+    static class JsonData {
+        List<Integer> itemIds;
+
+        public JsonData(List<Integer> itemIds) {
+            this.itemIds = itemIds;
+        }
+    }
 }