Better BatchPacket decoding and LoginPacket handling

src/pocketmine/network/Network.php

@@ -211,10 +211,11 @@ class Network{
 		$str = zlib_decode($packet->payload, 1024 * 1024 * 64); //Max 64MB
 		$len = strlen($str);
 		$offset = 0;
+		try{
 			while($offset < $len){
 				if(($pk = $this->getPacket(ord($str{$offset++}))) !== null){
 					if($pk->pid() === Info::BATCH_PACKET){
-					return;
+						throw new \InvalidStateException("Invalid BatchPacket inside BatchPacket");
 					}
 					$pk->setBuffer(substr($str, $offset));
 					$pk->decode();
@@ -225,6 +226,15 @@ class Network{
 					}
 				}
 			}
+		}catch(\Exception $e){
+			if(\pocketmine\DEBUG > 1){
+				$logger = $this->server->getLogger();
+				if($logger instanceof MainLogger){
+					$logger->debug("BatchPacket " . " 0x" . bin2hex($packet->payload));
+					$logger->logException($e);
+				}
+			}
+		}
 	}
 
 	/**

src/pocketmine/network/RakLibInterface.php

@@ -157,10 +157,12 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 					}
 				}
 
+				if(isset($this->players[$identifier])){
 					$this->interface->blockAddress($this->players[$identifier]->getAddress(), 5);
 				}
 			}
 		}
+	}
 
 	public function blockAddress($address, $timeout = 300){
 		$this->interface->blockAddress($address, $timeout);

src/pocketmine/network/protocol/LoginPacket.php

@@ -44,7 +44,7 @@ class LoginPacket extends DataPacket{
 		$this->username = $this->getString();
 		$this->protocol1 = $this->getInt();
 		$this->protocol2 = $this->getInt();
-		if(Info::CURRENT_PROTOCOL != $this->protocol1){
+		if($this->protocol1 < 21){ //New fields!
 			return;
 		}
 		$this->clientId = $this->getInt();