From bf9b8722c9a62412f3b47ee9565ce30023153552 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 26 Apr 2017 22:02:45 +0100
Subject: [PATCH] Cleaned up batching checks

---
 src/pocketmine/network/mcpe/protocol/BatchPacket.php | 8 ++++++--
 src/pocketmine/network/mcpe/protocol/LoginPacket.php | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pocketmine/network/mcpe/protocol/BatchPacket.php b/src/pocketmine/network/mcpe/protocol/BatchPacket.php
index 98a10578e..ed4497abe 100644
--- a/src/pocketmine/network/mcpe/protocol/BatchPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BatchPacket.php
@@ -57,6 +57,9 @@ class BatchPacket extends DataPacket{
 	 */
 	public function addPacket($packet){
 		if($packet instanceof DataPacket){
+			if(!$packet->canBeBatched()){
+				throw new \InvalidArgumentException(get_class($packet) . " cannot be put inside a BatchPacket");
+			}
 			if(!$packet->isEncoded){
 				$packet->encode();
 			}
@@ -93,9 +96,10 @@ class BatchPacket extends DataPacket{
 		while(!$this->feof()){
 			$buf = $this->getString();
 			$pk = $network->getPacket(ord($buf{0}));
-			/*if(!$pk->canBeBatched()){
+
+			if(!$pk->canBeBatched()){
 				throw new \InvalidArgumentException("Received invalid " . get_class($pk) . " inside BatchPacket");
-			}*/
+			}
 
 			$pk->setBuffer($buf, 1);
 			$session->handleDataPacket($pk);
diff --git a/src/pocketmine/network/mcpe/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php
index f828d732a..6662e2e88 100644
--- a/src/pocketmine/network/mcpe/protocol/LoginPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php
@@ -44,10 +44,6 @@ class LoginPacket extends DataPacket{
 
 	public $clientData = [];
 
-	public function canBeBatched() : bool{
-		return false;
-	}
-
 	public function canBeSentBeforeLogin() : bool{
 		return true;
 	}