From b192dcec842cf043ae936c446bb252259b415ab5 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Wed, 7 Jun 2017 19:21:39 +0500
Subject: 2017-06-07

---
 src/world/World.cpp | 153 ++++++++++++++++++++++++++--------------------------
 1 file changed, 76 insertions(+), 77 deletions(-)

(limited to 'src/world/World.cpp')

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 121b904..2220627 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -1,84 +1,84 @@
 #include "World.hpp"
 
 void World::ParseChunkData(Packet packet) {
-    int chunkX = packet.GetField(0).GetInt();
-    int chunkZ = packet.GetField(1).GetInt();
-    bool isGroundContinuous = packet.GetField(2).GetBool();
-    std::bitset<16> bitmask(packet.GetField(3).GetVarInt());
-    int entities = packet.GetField(5).GetVarInt();
-
-    size_t dataLen = packet.GetField(5).GetLength();
-    byte *content = new byte[dataLen];
-    byte *contentOrigPtr = content;
-    packet.GetField(5).CopyToBuff(content);
-
-    if (isGroundContinuous)
-        dataLen -= 256;
-
-    byte *biomes = content + packet.GetField(5).GetLength() - 256;
-    for (int i = 0; i < 16; i++) {
-        if (bitmask[i]) {
-            size_t len = 0;
-            Vector chunkPosition = Vector(chunkX, i, chunkZ);
-            if (!m_sections.insert(std::make_pair(chunkPosition, ParseSection(content, len))).second)
-                LOG(ERROR) << "Chunk not created: " << chunkPosition;
-            auto sectionIter = m_sections.find(chunkPosition);
-            if (sectionIter == m_sections.end())
-                LOG(ERROR)<< "Created chunk not found: " << chunkPosition;
-            else
-                sectionIter->second.Parse();
-            content += len;
-        }
-    }
-    delete[] contentOrigPtr;
+	int chunkX = packet.GetField(0).GetInt();
+	int chunkZ = packet.GetField(1).GetInt();
+	bool isGroundContinuous = packet.GetField(2).GetBool();
+	std::bitset<16> bitmask(packet.GetField(3).GetVarInt());
+	int entities = packet.GetField(5).GetVarInt();
+
+	size_t dataLen = packet.GetField(5).GetLength();
+	byte *content = new byte[dataLen];
+	byte *contentOrigPtr = content;
+	packet.GetField(5).CopyToBuff(content);
+
+	if (isGroundContinuous)
+		dataLen -= 256;
+
+	byte *biomes = content + packet.GetField(5).GetLength() - 256;
+	for (int i = 0; i < 16; i++) {
+		if (bitmask[i]) {
+			size_t len = 0;
+			Vector chunkPosition = Vector(chunkX, i, chunkZ);
+			if (!m_sections.insert(std::make_pair(chunkPosition, ParseSection(content, len))).second)
+				LOG(ERROR) << "Chunk not created: " << chunkPosition;
+			auto sectionIter = m_sections.find(chunkPosition);
+			if (sectionIter == m_sections.end())
+				LOG(ERROR) << "Created chunk not found: " << chunkPosition;
+			else
+				sectionIter->second.Parse();
+			content += len;
+		}
+	}
+	delete[] contentOrigPtr;
 }
 
 Section World::ParseSection(byte *data, size_t &dataLen) {
-    dataLen = 0;
-
-    Field fBitsPerBlock = FieldParser::Parse(UnsignedByte, data);
-    byte bitsPerBlock = fBitsPerBlock.GetUByte();
-    data += fBitsPerBlock.GetLength();
-    dataLen += fBitsPerBlock.GetLength();
-
-    Field fPaletteLength = FieldParser::Parse(VarIntType, data);
-    int paletteLength = fPaletteLength.GetVarInt();
-    data += fPaletteLength.GetLength();
-    dataLen += fPaletteLength.GetLength();
-
-    std::vector<unsigned short> palette;
-    if (paletteLength > 0) {
-        for (unsigned char i = 0; i < paletteLength; i++) {
-            endswap(&i);
-            Field f = FieldParser::Parse(VarIntType, data);
-            data += f.GetLength();
-            dataLen += f.GetLength();
-            palette.push_back(f.GetVarInt());
-            endswap(&i);
-        }
-    }
-
-    Field fDataLength = FieldParser::Parse(VarIntType, data);
-    data += fDataLength.GetLength();
-    dataLen += fDataLength.GetLength();
-
-    int dataLength = fDataLength.GetVarInt();
-    size_t dataSize = dataLength * 8;
-    dataLen += dataSize;
-    byte *dataBlocks = data;
-
-    data += 2048;
-    dataLen += 2048;
-    byte *dataLight = data;
-
-    byte *dataSky = nullptr;
-    if (m_dimension == 0) {
-        data += 2048;
-        dataLen += 2048;
-        dataSky = data;
-    }
-
-    return Section(dataBlocks, dataSize, dataLight, dataSky, bitsPerBlock, palette);
+	dataLen = 0;
+
+	Field fBitsPerBlock = FieldParser::Parse(UnsignedByte, data);
+	byte bitsPerBlock = fBitsPerBlock.GetUByte();
+	data += fBitsPerBlock.GetLength();
+	dataLen += fBitsPerBlock.GetLength();
+
+	Field fPaletteLength = FieldParser::Parse(VarIntType, data);
+	int paletteLength = fPaletteLength.GetVarInt();
+	data += fPaletteLength.GetLength();
+	dataLen += fPaletteLength.GetLength();
+
+	std::vector<unsigned short> palette;
+	if (paletteLength > 0) {
+		for (unsigned char i = 0; i < paletteLength; i++) {
+			endswap(&i);
+			Field f = FieldParser::Parse(VarIntType, data);
+			data += f.GetLength();
+			dataLen += f.GetLength();
+			palette.push_back(f.GetVarInt());
+			endswap(&i);
+		}
+	}
+
+	Field fDataLength = FieldParser::Parse(VarIntType, data);
+	data += fDataLength.GetLength();
+	dataLen += fDataLength.GetLength();
+
+	int dataLength = fDataLength.GetVarInt();
+	size_t dataSize = dataLength * 8;
+	dataLen += dataSize;
+	byte *dataBlocks = data;
+
+	data += 2048;
+	dataLen += 2048;
+	byte *dataLight = data;
+
+	byte *dataSky = nullptr;
+	if (m_dimension == 0) {
+		data += 2048;
+		dataLen += 2048;
+		dataSky = data;
+	}
+
+	return Section(dataBlocks, dataSize, dataLight, dataSky, bitsPerBlock, palette);
 }
 
 World::~World() {
@@ -86,5 +86,4 @@ World::~World() {
 
 World::World() {
 
-}
-
+}
\ No newline at end of file
-- 
cgit v1.2.3