Merge remote-tracking branch 'origin/master' into ScoreBoard

# Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd
2016-03-03 22:56:39 +01:00
parent 011aa53bc0 c467d54d44
commit 0a21fe15dd
44 changed files with 12332 additions and 2416 deletions
@@ -47,7 +47,7 @@ int UDPClient::readBuffer()
    memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
    if (sizeOfPacket > m_Socket->available()) {
        LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
-        return 0;
+        //return 0;
    }
    // if the buffer is to small increase the size of it
    if (sizeOfPacket > m_BufferSize) {
@@ -94,7 +94,7 @@ int UDPServer::readBuffer()

    if (sizeOfPacket > m_Socket->available()) {
        LOG_WARNING("UDPServer::readBuffer(): We haven't got the whole packet yet.");
-        return 0;
+        //return 0;
    }

    // if the buffer is to small increase the size of it