Merge branch 'mc'

c6944887 · nanahira · c99d2767 · 8d558fb3 · c6944887 · c6944887
Commit c6944887 authored Aug 17, 2021 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

Replay.coffee Replay.coffee +4 -3

Replay.js Replay.js +5 -4

No files found.
--- a/Replay.coffee
+++ b/Replay.coffee
@@ -122,9 +122,10 @@ class Replay
  @fromBuffer: (buffer) ->
    reader = new ReplayReader buffer
    header = Replay.readHeader reader
-    lzmaBuffer = Buffer.concat [header.getLzmaHeader(), reader.readAll()]
-    if header.isCompressed
-      decompressed = lzmaBuffer
+    restBuffer = reader.readAll()
+    lzmaBuffer = Buffer.concat [header.getLzmaHeader(), restBuffer]
+    if !header.isCompressed
+      decompressed = restBuffer
    else
      decompressed = Buffer.from lzma.decompress lzmaBuffer
    reader = new ReplayReader decompressed

--- a/Replay.js
+++ b/Replay.js
@@ -180,12 +180,13 @@
      }

      static fromBuffer(buffer) {
-        var decompressed, header, lzmaBuffer, reader, replay;
+        var decompressed, header, lzmaBuffer, reader, replay, restBuffer;
        reader = new ReplayReader(buffer);
        header = Replay.readHeader(reader);
-        lzmaBuffer = Buffer.concat([header.getLzmaHeader(), reader.readAll()]);
-        if (header.isCompressed) {
-          decompressed = lzmaBuffer;
+        restBuffer = reader.readAll();
+        lzmaBuffer = Buffer.concat([header.getLzmaHeader(), restBuffer]);
+        if (!header.isCompressed) {
+          decompressed = restBuffer;
        } else {
          decompressed = Buffer.from(lzma.decompress(lzmaBuffer));
        }