mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2025-02-17 03:02:35 +01:00
WiredTriggerHabboSaysKeyword now saves as json
This commit is contained in:
parent
4123593308
commit
4fcf750763
@ -41,16 +41,27 @@ public class WiredTriggerHabboSaysKeyword extends InteractionWiredTrigger {
|
||||
|
||||
@Override
|
||||
public String getWiredData() {
|
||||
return (this.ownerOnly ? "1" : "0") + "\t" + this.key;
|
||||
return WiredHandler.getGsonBuilder().create().toJson(new JsonData(
|
||||
this.ownerOnly,
|
||||
this.key
|
||||
));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
||||
String[] data = set.getString("wired_data").split("\t");
|
||||
String wiredData = set.getString("wired_data");
|
||||
|
||||
if (data.length == 2) {
|
||||
this.ownerOnly = data[0].equalsIgnoreCase("1");
|
||||
this.key = data[1];
|
||||
if (wiredData.startsWith("{")) {
|
||||
JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class);
|
||||
this.ownerOnly = data.ownerOnly;
|
||||
this.key = data.key;
|
||||
} else {
|
||||
String[] data = wiredData.split("\t");
|
||||
|
||||
if (data.length == 2) {
|
||||
this.ownerOnly = data[0].equalsIgnoreCase("1");
|
||||
this.key = data[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -93,4 +104,14 @@ public class WiredTriggerHabboSaysKeyword extends InteractionWiredTrigger {
|
||||
public boolean isTriggeredByRoomUnit() {
|
||||
return true;
|
||||
}
|
||||
|
||||
static class JsonData {
|
||||
boolean ownerOnly;
|
||||
String key;
|
||||
|
||||
public JsonData(boolean ownerOnly, String key) {
|
||||
this.ownerOnly = ownerOnly;
|
||||
this.key = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user