fixed NBT editor

DoubleDoorDevelopment · Jan 22, 2015 · 4453513 · 4453513
1 parent 42c695f
commit 4453513
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/freemarker_implicit.ftl b/src/main/java/freemarker_implicit.ftl
@@ -1,7 +1,7 @@
 [#ftl]
 [#-- @implicitly included --]
+[#-- @ftlvariable name="fm" type="net.doubledoordev.backend.server.FileManager" --]
 [#-- @ftlvariable name="user" type="net.doubledoordev.backend.permissions.User" --]
 [#-- @ftlvariable name="server" type="net.doubledoordev.backend.server.Server" --]
 [#-- @ftlvariable name="Helper" type="net.doubledoordev.backend.util.Helper" --]
 [#-- @ftlvariable name="Settings" type="net.doubledoordev.backend.util.Settings" --]
-[#-- @ftlvariable name="fm" type="net.doubledoordev.backend.server.FileManager" file="templates/filemanager.ftl" --]
diff --git a/src/main/java/net/doubledoordev/backend/server/FileManager.java b/src/main/java/net/doubledoordev/backend/server/FileManager.java
@@ -220,9 +220,17 @@ public String getFileContents() throws IOException
                 return FileUtils.readFileToString(file);
             case "dat":
             case "dat_old":
+
                 Tag tag = Helper.readRawNBT(file, true);
                 if (tag == null) tag = Helper.readRawNBT(file, false);
-                if (tag != null) return JsonNBTHelper.parseNBT(tag).toString();
+                if (tag != null)
+                {
+                    return JsonNBTHelper.parseNBT(tag).toString();
+                }
+                else
+                {
+                    return FileUtils.readFileToString(file);
+                }
             case "jpg":
             case "png":
                 return String.format("data:%s;base64,%s", MimeType.get(getExtension()), Base64.encodeBase64String(FileUtils.readFileToByteArray(file)));

diff --git a/src/main/resources/templates/editors/json.ftl b/src/main/resources/templates/editors/json.ftl
@@ -58,8 +58,7 @@
         };
         function send()
         {
-            websocket.send(websocket.send(JSON.stringify({method: "set", args: [JSON.stringify(editor.get())]}));
-        )
+            websocket.send(JSON.stringify({method: "set", args: [JSON.stringify(editor.get())]}));
         }
         websocket.onmessage = function (evt)
         {