From 4b0fbf2793dcbb98f5689847f4fc8c7a87f504ca Mon Sep 17 00:00:00 2001
From: malloc <aleco@aroltd.com>
Date: Fri, 6 Apr 2018 07:43:40 -0500
Subject: [PATCH] this is literally two lines

---
 server/src/sock/scapesock.cpp | 10 ++--------
 server/src/sock/scapesock.hpp |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/server/src/sock/scapesock.cpp b/server/src/sock/scapesock.cpp
index 55a0b24..c8ee5e0 100644
--- a/server/src/sock/scapesock.cpp
+++ b/server/src/sock/scapesock.cpp
@@ -91,15 +91,9 @@ int sosc::ScapeConnection::Receive(Packet* packet, bool block) {
     }
     
     // TODO optimize
-    this->frameQueue.push(frame);
+    this->multiframe_buffer += frame.GetBody();
     if(frame.IsFinal()) {
-        std::string pck;
-        while(!this->frameQueue.empty()) {
-            pck += this->frameQueue.front().GetBody();
-            this->frameQueue.pop();
-        }
-        
-        if(packet->Parse(pck) == PCK_OK)
+        if(packet->Parse(this->multiframe_buffer) == PCK_OK)
             return PCK_OK;
         else
             return PCK_ERR;
diff --git a/server/src/sock/scapesock.hpp b/server/src/sock/scapesock.hpp
index c4f548a..efc1785 100644
--- a/server/src/sock/scapesock.hpp
+++ b/server/src/sock/scapesock.hpp
@@ -41,7 +41,7 @@ private:
     TcpClient client;
     
     std::string buffer;
-    std::queue<ws::Frame> frameQueue;
+    std::string multiframe_buffer;
     
     friend class ScapeServer;
 };