Redstone

.gitignore

@@ -16,4 +16,5 @@ white-list.txt
 start.sh
 mods/
 launcher.sh
-checker.sh
+checker.sh
+*.DS_Store

src/pocketmine/ChunkStorage.php

@@ -56,79 +56,40 @@ protected function sendFromCache($data) {
 
 	protected function doChunk($data) {
 		$protocol = $data['protocol'];
-		$sectionsData = [];
 		if (isset($data['isAnvil']) && $data['isAnvil'] == true) {
 			$chunkData = chr(count($data['chunk']['sections']));
 			foreach ($data['chunk']['sections'] as $y => $sections) {
 				if ($sections['empty'] == true) {
-					if ($protocol >= Info::PROTOCOL_120) {
-						$blockData = "\x00" . str_repeat("\x00", 6144);						
-						$chunkData .= $blockData;
-					} else {
-						$chunkData .= "\x00" . str_repeat("\x00", 10240);
-					}
+					$blockData = "\x00" . str_repeat("\x00", 6144);						
+					$chunkData .= $blockData;
 				} else {
-					if ($protocol >= Info::PROTOCOL_120) {
-						if (isset($data['isSorted']) && $data['isSorted'] == true) {
-							$blockData = "\x00" . $sections['blocks'] . $sections['data'];
-						} else {
-							$blockData = "\x00" . $this->sortData($sections['blocks']) . $this->sortHalfData($sections['data']);
-						}
-						$chunkData .= $blockData;
+					if (isset($data['isSorted']) && $data['isSorted'] == true) {
+						$blockData = "\x00" . $sections['blocks'] . $sections['data'];
 					} else {
-						if (isset($data['isSorted']) && $data['isSorted'] == true) {
-							$blockData = "\x00" . $sections['blocks'] . $sections['data'];
-							$lightData = $sections['skyLight'] . $sections['blockLight'];
-						} else {
-							$blockData = "\x00" . $this->sortData($sections['blocks']) . $this->sortHalfData($sections['data']);
-							$lightData = $this->sortHalfData($sections['skyLight']) . $this->sortHalfData($sections['blockLight']);
-						}
-						$chunkData .= $blockData . $lightData;
+						$blockData = "\x00" . $this->sortData($sections['blocks']) . $this->sortHalfData($sections['data']);
 					}
+					$chunkData .= $blockData;
 				}
 			}
 			if ($protocol < Info::PROTOCOL_360) {
 				$chunkData .= $data['chunk']['heightMap'];
 			}
 			$chunkData .= $data['chunk']['biomeColor'] . Binary::writeByte(0) . Binary::writeSignedVarInt(0) . implode('', $data['tiles']);
 		} else {
-			if ($protocol >= Info::PROTOCOL_120) {
-				$blockIdArray = $data['blocks'];
-				$blockDataArray = $data['data'];
-				$countBlocksInChunk = 8;
-				$chunkData = chr($countBlocksInChunk);
-				for ($blockIndex = 0; $blockIndex < $countBlocksInChunk; $blockIndex++) {
-					$blockIdData = '';
-					$blockDataData = '';
-					for ($i = 0; $i < 256; $i++) {
-						$startIndex = ($blockIndex + ($i << 3)) << 3;
-						$blockIdData .= substr($blockIdArray, $startIndex << 1, 16);
-						$blockDataData .= substr($blockDataArray, $startIndex, 8);
-					}
-					$blockData = "\x00" . $blockIdData . $blockDataData;
-					$chunkData .= $blockData;
-				}
-			} else {
-				$blockIdArray = $data['blocks'];
-				$blockDataArray = $data['data'];
-				$skyLightArray = $data['skyLight'];
-				$blockLightArray = $data['blockLight'];
-				$countBlocksInChunk = 8;
-				$chunkData = chr($countBlocksInChunk);
-				for ($blockIndex = 0; $blockIndex < $countBlocksInChunk; $blockIndex++) {
-					$blockIdData = '';
-					$blockDataData = '';
-					$skyLightData = '';
-					$blockLightData = '';
-					for ($i = 0; $i < 256; $i++) {
-						$startIndex = ($blockIndex + ($i << 3)) << 3;
-						$blockIdData .= substr($blockIdArray, $startIndex << 1, 16);
-						$blockDataData .= substr($blockDataArray, $startIndex, 8);
-						$skyLightData .= substr($skyLightArray, $startIndex, 8);
-						$blockLightData .= substr($blockLightArray, $startIndex, 8);
-					}
-					$chunkData .= "\x00" . $blockIdData . $blockDataData . $skyLightData . $blockLightData;
+			$blockIdArray = $data['blocks'];
+			$blockDataArray = $data['data'];
+			$countBlocksInChunk = 8;
+			$chunkData = chr($countBlocksInChunk);
+			for ($blockIndex = 0; $blockIndex < $countBlocksInChunk; $blockIndex++) {
+				$blockIdData = '';
+				$blockDataData = '';
+				for ($i = 0; $i < 256; $i++) {
+					$startIndex = ($blockIndex + ($i << 3)) << 3;
+					$blockIdData .= substr($blockIdArray, $startIndex << 1, 16);
+					$blockDataData .= substr($blockDataArray, $startIndex, 8);
 				}
+				$blockData = "\x00" . $blockIdData . $blockDataData;
+				$chunkData .= $blockData;
 			}
 			$chunkData .= $data['heightMap'] . $data['biomeColor'] . Binary::writeLInt(0) . implode('', $data['tiles']);
 		}
@@ -141,8 +102,8 @@ protected function doChunk($data) {
 		$pk->encode($protocol);
 		$buffer = $pk->getBuffer();
 		$decodedBuffer = Binary::writeVarInt(strlen($buffer)) . $buffer;
-		$buffer = zlib_encode($decodedBuffer, ZLIB_ENCODING_DEFLATE, 7);
-		$this->server->sendData($data['identifier'], $buffer);
+		$buffer = zlib_encode($decodedBuffer, Player::getCompressAlg($protocol), 7);
+        $this->server->sendData($data['identifier'], $buffer);
 		$this->setCache(Level::chunkHash($data['chunkX'], $data['chunkZ']), ($protocol << 4) | $subClientId, $buffer);
 	}
 

src/pocketmine/PacketMaker.php

@@ -70,50 +70,44 @@ protected function tick() {
 	}
 
 	protected function checkPacket($data) {
-		foreach ($data['moveData'] as $identifier => $moveData) {
-			$moveStr = "";
-			foreach ($moveData['data'] as $singleMoveData) {
-				if ($singleMoveData[7]) {
-					$pk = new MovePlayerPacket();
-					$pk->eid = $singleMoveData[0];
-					$pk->x = $singleMoveData[1];
-					$pk->y = $singleMoveData[2];
-					$pk->z = $singleMoveData[3];
-					$pk->pitch = $singleMoveData[6];
-					$pk->yaw = $singleMoveData[5];
-					$pk->bodyYaw = $singleMoveData[4];
-				} else {
-					$pk = new MoveEntityPacket();
-					$pk->entities = [$singleMoveData];
+		$moveData = $data['data'];
+		$playersData = $data['player'];
+		$encodedPackets = [];
+		foreach ($playersData as $identifier => $playerData) {	
+			$moveStr = '';
+			foreach ($playerData['subIds'] as $subClientId => $entityIds) {
+				$playerIndex = ($playerData['playerProtocol'] << 4) | $subClientId;
+				foreach ($entityIds as $eid) {
+					if (!isset($encodedPackets[$eid][$playerIndex])) {
+						if (!isset($moveData[$eid])) {
+							continue;
+						}
+						$singleMoveData = $moveData[$eid];
+						if ($singleMoveData[7]) {
+							$pk = new MovePlayerPacket();
+							$pk->eid = $singleMoveData[0];
+							$pk->x = $singleMoveData[1];
+							$pk->y = $singleMoveData[2];
+							$pk->z = $singleMoveData[3];
+							$pk->pitch = $singleMoveData[6];
+							$pk->yaw = $singleMoveData[5];
+							$pk->bodyYaw = $singleMoveData[4];
+						} else {
+							$pk = new MoveEntityPacket();
+							$pk->entities = [$singleMoveData];
+						}
+						$pk->senderSubClientID = $subClientId;
+						$pk->encode($playerData['playerProtocol']);
+						$buffer = $pk->getBuffer();
+						$encodedPackets[$eid][$playerIndex] = Binary::writeVarInt(strlen($buffer)) . $buffer;
+					}
+					$moveStr .= $encodedPackets[$eid][$playerIndex];
 				}
-				$pk->senderSubClientID = $singleMoveData[8];
-				$pk->encode($moveData['playerProtocol']);
-				$buffer = $pk->getBuffer();
-				$moveStr .= Binary::writeVarInt(strlen($buffer)) . $buffer;
 			}
-			$buffer = zlib_encode($moveStr, ZLIB_ENCODING_DEFLATE, 7);
-			$pkBatch = new BatchPacket();
-			$pkBatch->payload = $buffer;
-			$pkBatch->encode($moveData['playerProtocol']);
-			$pkBatch->isEncoded = true;
-			$this->sendData($identifier, $pkBatch->getBuffer());
-		}
-		foreach ($data['motionData'] as $identifier => $motionData) {
-			$motionStr = "";
-			foreach ($motionData['data'] as $singleMotionData) {
-				$pk = new SetEntityMotionPacket();
-				$pk->entities = [$singleMotionData];
-				$pk->senderSubClientID = $singleMotionData[4];
-				$pk->encode($motionData['playerProtocol']);
-				$buffer = $pk->getBuffer();
-				$motionStr .= Binary::writeVarInt(strlen($buffer)) . $buffer;
+			if (!empty($moveStr)) {
+				$buffer = zlib_encode($moveStr, Player::getCompressAlg($playerData['playerProtocol']), 7);
+				$this->sendData($identifier, $buffer);
 			}
-			$buffer = zlib_encode($motionStr, ZLIB_ENCODING_DEFLATE, 7);
-			$pkBatch = new BatchPacket();
-			$pkBatch->payload = $buffer;
-			$pkBatch->encode($motionData['playerProtocol']);
-			$pkBatch->isEncoded = true;
-			$this->sendData($identifier, $pkBatch->getBuffer());
 		}
 	}