Skip to content

Commit b7e251f

Browse files
committed
Fix all downloading related bugs
1 parent 0737f86 commit b7e251f

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptInstallScreen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ protected ScriptInstallScreen(VirtualScript script) {
2929

3030
if (DFScript.MC.player != null) {
3131
for (Script s : ScriptManager.getInstance().getScripts()) {
32-
if (Objects.equals(s.getServer(), script.getId())) {
33-
if (Objects.equals(s.getOwner(), script.getOwner())) {
32+
if (s.getServer() != null && s.getServer().contains(script.getId())) {
33+
if (s.getOwner().contains(script.getOwner())) {
3434
return;
3535
}
3636

src/main/java/io/github/techstreet/dfscript/script/Script.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public Script deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
250250
String owner = null;
251251
if (object.get("owner") != null) owner = object.get("owner").getAsString();
252252

253-
String serverId = null;
253+
String serverId = "None";
254254
if (object.get("server") != null) serverId = object.get("server").getAsString();
255255

256256
String description = "N/A";
@@ -267,7 +267,10 @@ public Script deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
267267
int version = 0;
268268
if (object.get("version") != null) version = object.get("version").getAsInt();
269269

270-
return new Script(name, owner, serverId, parts, disabled, version);
270+
Script script = new Script(name, owner, serverId, parts, disabled, version);
271+
script.setDescription(description);
272+
273+
return script;
271274
}
272275

273276
@Override

src/main/java/io/github/techstreet/dfscript/script/VirtualScript.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ public void download(boolean update) {
5858

5959
String content = readAll(rd)
6060
.replace("\n", "")
61-
.replace("\"disabled\":true", "\"disabled\":false")
62-
.replace("\"server\":None", "\"server\":" + id + "");
61+
.replace("\"disabled\":\"true\"", "\"disabled\":\"false\"")
62+
.replace("\"server\":\"None\"", "\"server\":\"" + id + "\"");
63+
64+
if (!content.contains("\"server\"")) {
65+
content = content.replace(",\"actions\":", ",\"server\":\"" + id + "\",\"actions\":");
66+
}
6367

6468
System.out.println(content);
6569
Files.write(file.toPath(), content.getBytes());

0 commit comments

Comments
 (0)